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
This commit is contained in:
Robin H. Johnson
2015-08-08 13:49:04 -07:00
commit 56bd759df1
97532 changed files with 3536859 additions and 0 deletions

View File

@@ -0,0 +1,53 @@
--- build.xml 2008-02-24 20:10:00.000000000 +1300
+++ build.xml 2008-02-24 20:17:10.000000000 +1300
@@ -397,16 +397,6 @@
<classpath refid="project.class.path"/>
</javac>
- <!-- compile everything under src/test -->
- <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
- deprecation="on"
- debug="on"
- optimize="on"
- source="${javac.target.version}"
- target="${javac.target.version}">
- <classpath refid="test.class.path"/>
- </javac>
-
<!-- copy resource files to build directory -->
<copy todir="${build.classes}" >
<fileset dir="${src.dir}/java" >
@@ -430,6 +420,24 @@
<class name="org.tanukisoftware.wrapper.WrapperManager"/>
</javah>
</target>
+
+ <target name="compile-test" depends="compile-java-warn">
+ <!-- compile everything under src/test -->
+ <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
+ deprecation="on"
+ debug="on"
+ optimize="on"
+ source="${javac.target.version}"
+ target="${javac.target.version}">
+ <classpath refid="test.class.path"/>
+ <classpath>
+ <fileset dir="lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
+ </target>
+
<target name="msvc-missing" depends="init:msg" if="msvc.missing">
<condition property="msvc.home.v8_c" value="${msvc.home.v8_64_c}">
<equals arg1="${bits}" arg2="64"/>
@@ -636,7 +644,7 @@
<!-- =================================================================== -->
<!-- Test Task -->
<!-- =================================================================== -->
- <target name="test" depends="jar" description="Runs unit tests">
+ <target name="test" depends="compile-test,jar" description="Runs unit tests">
<mkdir dir="${build.tests}"/>
<junit fork="true"

View File

@@ -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/$$/ :/' \

View File

@@ -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/$$/ :/' \

View File

@@ -0,0 +1,22 @@
Author: Ralph Sennhauser <sera@gentoo.org>
Added in 3.5.4, make false default for Gentoo
* Add a new wrapper.java.command.resolve property to control whether or not the
Wrapper tries to resolve any symbolic links in the Java command, specified
with the wrapper.java.command property. Historically, it has always done so,
but some jvm started applications like run-java-tool on Gentoo will fail if
it is run directly as they have a check to make sure it is launched via a
symbolic link.
--- a/src/c/wrapper.c
+++ b/src/c/wrapper.c
@@ -4664,7 +4664,7 @@ void checkIfRegularExe(TCHAR** para) {
if (!path) {
log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
} else {
- replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE, TRUE);
+ replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE, TRUE);
if (replacePath == TRUE) {
free(*para);
*para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));

View File

@@ -0,0 +1,156 @@
--- src/c/Makefile-linux-armel-32.make.old 2014-07-21 10:48:31.000000000 +0200
+++ src/c/Makefile-linux-armel-32.make 2014-07-21 10:50:11.000000000 +0200
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
%.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/$$/ :/' \
--- src/c/Makefile-linux-armhf-32.make.old 2014-07-21 10:48:31.000000000 +0200
+++ src/c/Makefile-linux-armhf-32.make 2014-07-21 10:51:05.000000000 +0200
@@ -33,14 +33,14 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
%.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/$$/ :/' \
--- src/c/Makefile-linux-ia-64.make.old 2014-07-21 10:48:31.000000000 +0200
+++ src/c/Makefile-linux-ia-64.make 2014-07-21 10:51:37.000000000 +0200
@@ -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) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
%.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/$$/ :/' \
--- src/c/Makefile-linux-ppc-32.make.old 2014-07-21 10:48:31.000000000 +0200
+++ src/c/Makefile-linux-ppc-32.make 2014-07-21 10:52:05.000000000 +0200
@@ -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) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
%.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/$$/ :/' \
--- src/c/Makefile-linux-ppc-64.make.old 2014-07-21 10:48:31.000000000 +0200
+++ src/c/Makefile-linux-ppc-64.make 2014-07-21 10:52:45.000000000 +0200
@@ -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) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
%.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/$$/ :/' \
--- src/c/Makefile-linux-x86-32.make.old 2014-07-21 10:48:31.000000000 +0200
+++ src/c/Makefile-linux-x86-32.make 2014-07-21 10:53:39.000000000 +0200
@@ -36,17 +36,17 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
testsuite: $(testsuite_SOURCE)
- $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
%.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/$$/ :/' \
--- src/c/Makefile-linux-x86-64.make.old 2014-07-21 10:48:31.000000000 +0200
+++ src/c/Makefile-linux-x86-64.make 2014-07-21 10:54:16.000000000 +0200
@@ -36,17 +36,17 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
testsuite: $(testsuite_SOURCE)
- $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
%.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/$$/ :/' \

View File

@@ -0,0 +1,25 @@
|Original version of this patch by Ralph Sennhauser <sera@gentoo.org>
|Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn>
|
|Added in 3.5.4, make false default for Gentoo
|
|* Add a new wrapper.java.command.resolve property to control whether or not the
| Wrapper tries to resolve any symbolic links in the Java command, specified
| with the wrapper.java.command property. Historically, it has always done so,
| but some jvm started applications like run-java-tool on Gentoo will fail if
| it is run directly as they have a check to make sure it is launched via a
| symbolic link.
|
--- src/c/wrapper.c.old 2014-07-21 09:12:55.000000000 +0200
+++ src/c/wrapper.c 2014-07-21 09:13:22.000000000 +0200
@@ -4908,7 +4908,7 @@
if (!path) {
log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
} else {
- replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE);
+ replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE);
if (replacePath == TRUE) {
free(*para);
*para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));

View File

@@ -0,0 +1,12 @@
diff -u -r wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make
--- wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make 2014-09-06 00:06:05.730644375 +0200
+++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make 2014-09-06 00:06:51.130013387 +0200
@@ -23,7 +23,7 @@
LIB = ../../lib
TEST = ../../test
-all: init wrapper libwrapper.so testsuite
+all: init wrapper libwrapper.so
clean:
rm -f *.o