]> git.pld-linux.org Git - packages/pingus.git/commitdiff
- I HATE scons, it doesn't provide any standard way to pass compiler and flags
authorJakub Bogusz <qboosh@pld-linux.org>
Fri, 14 Sep 2007 21:39:27 +0000 (21:39 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
- disable binreloc, not needed in distribution package

Changed files:
    pingus-opt.patch -> 1.1

pingus-opt.patch [new file with mode: 0644]

diff --git a/pingus-opt.patch b/pingus-opt.patch
new file mode 100644 (file)
index 0000000..aa88864
--- /dev/null
@@ -0,0 +1,34 @@
+--- pingus-0.7.0/src/SConscript.orig   2007-08-24 23:49:45.000000000 +0200
++++ pingus-0.7.0/src/SConscript        2007-09-14 21:59:52.759075168 +0200
+@@ -21,8 +21,9 @@
+ import os
+ env = Environment(# ENV = {'PKG_CONFIG_PATH' : os.getenv('PKG_CONFIG_PATH')},
+-                  CCFLAGS = ['-O2', '-Wall', '-Werror', '-g'],
+-                  CPPDEFINES = ['ENABLE_BINRELOC'],
++                CXX = ARGUMENTS.get('CXX', 'g++'),
++                CC = ARGUMENTS.get('CC', 'gcc'),
++                  CCFLAGS = ARGUMENTS.get('CXXFLAGS', ['-O2', '-Wall', '-Werror', '-g']),
+                   CPPPATH = ['..', '.'])
+ env.ParseConfig('sdl-config  --cflags --libs')
+--- pingus-0.7.0/src/pingus_main.cpp.orig      2007-09-14 21:53:32.829424211 +0200
++++ pingus-0.7.0/src/pingus_main.cpp   2007-09-14 21:53:19.504664876 +0200
+@@ -627,6 +627,7 @@ PingusMain::init_path_finder()
+   path_manager.add_path(data_path);
+   path_manager.add_path("data");
+ #else
++  path_manager.add_path("/usr/share/pingus/data");
+   path_manager.add_path("data");
+ #endif
+--- pingus-0.7.0/SConstruct.orig       2005-12-05 18:00:26.000000000 +0100
++++ pingus-0.7.0/SConstruct    2007-09-14 21:43:22.494643214 +0200
+@@ -22,6 +22,7 @@ import sys, os
+ opts = Options(['options.cache', 'custom.py'])
+ opts.Add('CXX', 'The C++ compiler')
++opts.Add('CXXFLAGS', 'compiler flags')
+ opts.Add('PKG_CONFIG_PATH', 'Path for pkg-config files')
+ env = Environment(options=opts)
This page took 0.045613 seconds and 4 git commands to generate.