diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2011-08-14 22:18:55 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2011-08-14 22:18:55 +0000 |
| commit | a1db17759bcb4b9e7875feaf50cb4e8b5e79e402 (patch) | |
| tree | 55dd113f9d94dd4f3e423152d56bf8a9146b5437 /games-simulation/searchandrescue/files | |
| parent | Stable on amd64 wrt bug #379019 (diff) | |
| download | gentoo-2-a1db17759bcb4b9e7875feaf50cb4e8b5e79e402.tar.gz gentoo-2-a1db17759bcb4b9e7875feaf50cb4e8b5e79e402.tar.bz2 gentoo-2-a1db17759bcb4b9e7875feaf50cb4e8b5e79e402.zip | |
version bump
(Portage version: 2.1.10.3/cvs/Linux i686)
Diffstat (limited to 'games-simulation/searchandrescue/files')
| -rw-r--r-- | games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch b/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch new file mode 100644 index 000000000000..fe7236fbced0 --- /dev/null +++ b/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch @@ -0,0 +1,68 @@ +diff -ru searchandrescue_1.3.0.orig/sar/makefile_append.ini searchandrescue_1.3.0/sar/makefile_append.ini +--- searchandrescue_1.3.0.orig/sar/makefile_append.ini 2004-08-05 18:34:15.000000000 -0400 ++++ searchandrescue_1.3.0/sar/makefile_append.ini 2011-04-06 18:12:26.599574441 -0400 +@@ -3,7 +3,7 @@ + + + # C++ flags: +-CPPFLAGS = -D__cplusplus -Dc_plusplus ++CPPFLAGS += -D__cplusplus -Dc_plusplus + + + # Source files list: +@@ -16,14 +16,12 @@ + OBJ_CPP = $(SRC_CPP:.cpp=.o) + .c.o: + @echo "Compiling module $*.o" +- @$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) ++ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + .cpp.o: + @echo "Compiling module $*.o" +- @$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) ++ $(CPP) -c $*.cpp $(INC_DIRS) $(CPPFLAGS) + + # Programs +-LS = ls +-LSFLAGS = -s -h -c --color=auto + RM = rm + RMFLAGS = -f + +@@ -32,9 +30,8 @@ + + modules: $(OBJ_C) $(OBJ_CPP) + @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) ++ $(CPP) $(OBJ_C) $(OBJ_CPP) $(LDFLAGS) -o $(BIN) $(LIBS) $(LIB_DIRS) + @echo -n " " +- @-$(LS) $(LSFLAGS) $(BIN) + + prebuild: + @echo "Building program \"$(BIN)\"..." +@@ -54,5 +51,5 @@ + clean: + @echo "Cleaning program \"$(BIN)\"..." + @echo "Deleting all intermediate files..." +- @$(RM) $(RMFLAGS) a.out core *.o $(BIN) ++ $(RM) $(RMFLAGS) a.out core *.o $(BIN) + @echo "Clean done." +diff -ru searchandrescue_1.3.0.orig/sar/platforms.ini searchandrescue_1.3.0/sar/platforms.ini +--- searchandrescue_1.3.0.orig/sar/platforms.ini 2011-03-08 19:29:52.000000000 -0500 ++++ searchandrescue_1.3.0/sar/platforms.ini 2011-04-06 18:12:11.277632730 -0400 +@@ -102,7 +102,7 @@ + FeatureDepend = xf86vidmode-lib + DependType = Library + MustExist = Yes +- DependPath = libXxf86vm.a ++ DependPath = libXxf86vm.so + DependGrepString = XF86VidModeQueryExtension + FeatureDepend = xf86vidmode-devel + DependType = Header +@@ -223,7 +223,7 @@ + FeatureDepend = xf86vidmode-lib + DependType = Library + MustExist = Yes +- DependPath = libXxf86vm.a ++ DependPath = libXxf86vm.so + DependGrepString = XF86VidModeQueryExtension + FeatureDepend = xf86vidmode-devel + DependType = Header |