diff options
Diffstat (limited to 'dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch')
-rw-r--r-- | dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch new file mode 100644 index 000000000000..c61679a602c1 --- /dev/null +++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch @@ -0,0 +1,62 @@ +diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make +--- wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make 2008-08-17 10:40:04.000000000 +0300 ++++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make 2008-11-16 17:31:47.000000000 +0200 +@@ -7,7 +7,7 @@ + # license agreement you entered into with Tanuki Software. + # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html + +-COMPILE = gcc -O3 -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 ++COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64 + + INCLUDE=$(JAVA_HOME)/include + +@@ -33,14 +33,14 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm + + libwrapper.so: $(libwrapper_so_OBJECTS) +- ${COMPILE} -lm -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so ++ ${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm + + %.o: %.c +- @echo '$(COMPILE) -c $<'; \ +- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< ++ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ ++ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ +diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make +--- wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make 2008-08-17 10:40:04.000000000 +0300 ++++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make 2008-11-16 17:31:54.000000000 +0200 +@@ -7,7 +7,7 @@ + # license agreement you entered into with Tanuki Software. + # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html + +-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 ++COMPILE = $(CC) -fPIC -DLINUX -D_FILE_OFFSET_BITS=64 + + INCLUDE=$(JAVA_HOME)/include + +@@ -33,14 +33,14 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper ++ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm + + libwrapper.so: $(libwrapper_so_OBJECTS) +- ${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so ++ ${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm + + %.o: %.c +- @echo '$(COMPILE) -c $<'; \ +- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< ++ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ ++ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ |