mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-05-09 07:47:28 -07:00
56bd759df1
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
63 lines
2.7 KiB
Diff
63 lines
2.7 KiB
Diff
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/$$/ :/' \
|