pool/tanukiwrapper
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
tanukiwrapper/tanukiwrapper-Makefiles.patch
Tomáš Chvátal c473f96f04 - Version bump to 3.5.25: 
* Updating to latest upstream version
  * Javadoc is gone from the tarball
  * 8 years worth of developement, read revisions.txt in docs
- Cleanup the patches and merge all the makefile ones to one patch:
  * tanukiwrapper-Makefiles.patch
  * Removed patches:
    + tanukiwrapper-Makefile-s390-s390x-ppc.patch
    + tanukiwrapper-Makefile-aarch64.patch
    + tanukiwrapper-makefile-linux-x86-32.patch
- Remove patch that breaks build:
  * tanukiwrapper-crosslink.patch
- Refreshed patches
  * tanukiwrapper-ppc64le.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tanukiwrapper?expand=0&rev=18
2014-08-04 08:49:50 +00:00

223 lines
9.1 KiB
Diff
Raw Blame History

diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-aarch64-64.make wrapper_3.5.25_src/src/c/Makefile-linux-aarch64-64.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-aarch64-64.make 1970-01-01 01:00:00.000000000 +0100
+++ wrapper_3.5.25_src/src/c/Makefile-linux-aarch64-64.make 2014-08-04 10:37:49.921225870 +0200
@@ -0,0 +1,54 @@
+# Copyright (c) 1999, 2014 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# 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
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+testsuite_SOURCE = testsuite.c test_example.c test_javaadditionalparam.c test_hashmap.c test_filter.c wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+BIN = ../../bin
+LIB = ../../lib
+TEST = ../../test
+
+all: init wrapper libwrapper.so testsuite
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm
+
+testsuite: $(testsuite_SOURCE)
+ $(COMPILE) -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
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(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/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-32.make wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-32.make 2014-08-04 10:24:24.465225966 +0200
+++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make 2014-08-04 10:36:01.561225883 +0200
@@ -33,7 +33,7 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
libwrapper.so: $(libwrapper_so_OBJECTS)
${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-64.make wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-64.make 2014-08-04 10:24:24.466225966 +0200
+++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make 2014-08-04 10:36:24.849225880 +0200
@@ -33,7 +33,7 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+ $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
libwrapper.so: $(libwrapper_so_OBJECTS)
${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-s390x-64.make wrapper_3.5.25_src/src/c/Makefile-linux-s390x-64.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-s390x-64.make 1970-01-01 01:00:00.000000000 +0100
+++ wrapper_3.5.25_src/src/c/Makefile-linux-s390x-64.make 2014-08-04 10:35:31.250225886 +0200
@@ -0,0 +1,54 @@
+# Copyright (c) 1999, 2014 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# 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
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+testsuite_SOURCE = testsuite.c test_example.c test_javaadditionalparam.c test_hashmap.c test_filter.c wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+BIN = ../../bin
+LIB = ../../lib
+TEST = ../../test
+
+all: init wrapper libwrapper.so testsuite
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm
+
+testsuite: $(testsuite_SOURCE)
+ $(COMPILE) -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
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(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/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-s390-32.make wrapper_3.5.25_src/src/c/Makefile-linux-s390-32.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-s390-32.make 1970-01-01 01:00:00.000000000 +0100
+++ wrapper_3.5.25_src/src/c/Makefile-linux-s390-32.make 2014-08-04 10:34:57.675225890 +0200
@@ -0,0 +1,54 @@
+# Copyright (c) 1999, 2014 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# 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
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
+
+testsuite_SOURCE = testsuite.c test_example.c test_javaadditionalparam.c test_hashmap.c test_filter.c wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
+
+BIN = ../../bin
+LIB = ../../lib
+TEST = ../../test
+
+all: init wrapper libwrapper.so
+
+clean:
+ rm -f *.o
+
+cleanall: clean
+ rm -rf *~ .deps
+ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+ if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm
+
+testsuite: $(testsuite_SOURCE)
+ $(COMPILE) -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
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) $(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/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-32.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-32.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-32.make 2014-08-04 10:24:24.467225966 +0200
+++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-32.make 2014-08-04 10:31:00.972225918 +0200
@@ -36,7 +36,7 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm
testsuite: $(testsuite_SOURCE)
$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-64.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make
--- wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-64.make 2014-08-04 10:24:24.466225966 +0200
+++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make 2014-08-04 10:31:00.972225918 +0200
@@ -36,7 +36,7 @@
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm
testsuite: $(testsuite_SOURCE)
$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
Reference in New Issue View Git Blame Copy Permalink