summaryrefslogtreecommitdiff
path: root/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch')
-rw-r--r--dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
new file mode 100644
index 000000000000..ce5fd4aed26b
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
@@ -0,0 +1,62 @@
+diff -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make
+--- wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make 2012-02-08 21:14:51.000000000 +1300
++++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make 2012-04-18 23:47:55.000000000 +1200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
++COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+ 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} -shared $(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 -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make
+--- wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make 2012-02-08 21:14:51.000000000 +1300
++++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make 2012-04-18 23:50:06.000000000 +1200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+
+-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
++COMPILE = $(CC) -fPIC -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+
+ 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} -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/$$/ :/' \