diff options
| author | Jack Nagel | 2013-10-20 20:18:09 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-10-20 20:18:11 -0500 |
| commit | c6a98c0c6b8dc5e8d77771edcdb74eb70fc05558 (patch) | |
| tree | 9f3ba0e4515277fc547a37a6d0c08f4c3563c8e2 /Library | |
| parent | 97e8767a184b8d74858a02a9d4ec8bc18f90cd70 (diff) | |
| download | homebrew-c6a98c0c6b8dc5e8d77771edcdb74eb70fc05558.tar.bz2 | |
fceux: add patch to pass pkg-config vars through scons
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/fceux.rb | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/Library/Formula/fceux.rb b/Library/Formula/fceux.rb index fa03d7546..5d0246eaa 100644 --- a/Library/Formula/fceux.rb +++ b/Library/Formula/fceux.rb @@ -15,6 +15,10 @@ class Fceux < Formula depends_on 'lua' depends_on :x11 + # Make scons honor PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR + # Reported upstream: https://sourceforge.net/p/fceultra/bugs/625 + def patches; DATA; end + def install args = [] args << "GTK=0" if build.include? "no-gtk" @@ -22,3 +26,50 @@ class Fceux < Formula bin.install 'src/fceux' end end + +__END__ +diff --git a/SConstruct b/SConstruct +index 4d5b446..36be2c4 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -62,6 +62,10 @@ if os.environ.has_key('CPPFLAGS'): + env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split()) + if os.environ.has_key('LDFLAGS'): + env.Append(LINKFLAGS = os.environ['LDFLAGS'].split()) ++if os.environ.has_key('PKG_CONFIG_PATH'): ++ env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH'] ++if os.environ.has_key('PKG_CONFIG_LIBDIR'): ++ env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR'] + + print "platform: ", env['PLATFORM'] + +@@ -112,16 +116,12 @@ else: + Exit(1) + # Add compiler and linker flags from pkg-config + config_string = 'pkg-config --cflags --libs gtk+-2.0' +- if env['PLATFORM'] == 'darwin': +- config_string = 'PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig/ ' + config_string + env.ParseConfig(config_string) + env.Append(CPPDEFINES=["_GTK2"]) + env.Append(CCFLAGS = ["-D_GTK"]) + if env['GTK3']: + # Add compiler and linker flags from pkg-config + config_string = 'pkg-config --cflags --libs gtk+-3.0' +- if env['PLATFORM'] == 'darwin': +- config_string = 'PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig/ ' + config_string + env.ParseConfig(config_string) + env.Append(CPPDEFINES=["_GTK3"]) + env.Append(CCFLAGS = ["-D_GTK"]) +diff --git a/src/drivers/sdl/SConscript b/src/drivers/sdl/SConscript +index 7a53b07..23e11b9 100644 +--- a/src/drivers/sdl/SConscript ++++ b/src/drivers/sdl/SConscript +@@ -2,8 +2,6 @@ + # Thanks Antonio Ospite! + Import('env') + config_string = 'pkg-config --cflags --libs x11' +-if env['PLATFORM'] == 'darwin': +- config_string = 'PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig/ ' + config_string + env.ParseConfig(config_string) + Export('env') + |