* [gentoo-commits] gentoo-x86 commit in games-simulation/searchandrescue/files: searchandrescue-1.4.0-build.patch searchandrescue-1.5.0-build.patch
@ 2013-01-23 5:57 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; only message in thread
From: Michael Sterrett (mr_bones_) @ 2013-01-23 5:57 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 13/01/23 05:57:08
Modified: searchandrescue-1.4.0-build.patch
Added: searchandrescue-1.5.0-build.patch
Log:
version bump (bug #452266)
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2 games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch?r1=1.1&r2=1.2
Index: searchandrescue-1.4.0-build.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/files/searchandrescue-1.4.0-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- searchandrescue-1.4.0-build.patch 14 Aug 2011 22:18:55 -0000 1.1
+++ searchandrescue-1.4.0-build.patch 23 Jan 2013 05:57:08 -0000 1.2
@@ -1,6 +1,5 @@
-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
+--- searchandrescue_1.3.0.orig/sar/makefile_append.ini
++++ searchandrescue_1.3.0/sar/makefile_append.ini
@@ -3,7 +3,7 @@
@@ -45,9 +44,8 @@
- @$(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
+--- searchandrescue_1.3.0.orig/sar/platforms.ini
++++ searchandrescue_1.3.0/sar/platforms.ini
@@ -102,7 +102,7 @@
FeatureDepend = xf86vidmode-lib
DependType = Library
1.1 games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch?rev=1.1&content-type=text/plain
Index: searchandrescue-1.5.0-build.patch
===================================================================
--- searchandrescue_1.3.0.orig/sar/makefile_append.ini
+++ searchandrescue_1.3.0/sar/makefile_append.ini
@@ -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."
--- searchandrescue_1.3.0.orig/sar/platforms.ini
+++ searchandrescue_1.3.0/sar/platforms.ini
@@ -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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-01-23 5:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-23 5:57 [gentoo-commits] gentoo-x86 commit in games-simulation/searchandrescue/files: searchandrescue-1.4.0-build.patch searchandrescue-1.5.0-build.patch Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox