[Git][java-team/service-wrapper-java][master] 5 commits: Update makefiles patch to address FTBFS on riscv64 (Closes: #1019528)

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / service-wrapper-java


Commits:
2999f6d7 by tony mancill at 2022-09-11T08:00:12-07:00
Update makefiles patch to address FTBFS on riscv64 (Closes: #1019528)

Thank you to Eric Long for the patch.

- - - - -
cb62ff18 by tony mancill at 2022-09-11T08:00:53-07:00
Prepare changelog for upload

- - - - -
d862c226 by tony mancill at 2022-09-11T08:07:31-07:00
Update lintian-overrides

- - - - -
f6782a6e by tony mancill at 2022-09-11T08:08:09-07:00
Update DEP-3 headers

- - - - -
c9568398 by tony mancill at 2022-09-11T08:19:45-07:00
Update lintian-overrides for libservice-wrapper-doc

- - - - -


5 changed files:

- debian/changelog
- debian/libservice-wrapper-doc.lintian-overrides
- + debian/patches/riscv64-support.patch
- debian/patches/series
- debian/source/lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+service-wrapper-java (3.5.50-3) unstable; urgency=medium
+
+  * Update makefiles patch to address FTBFS on riscv64 (Closes: #1019528)
+    Thank you to Eric Long for the patch.
+
+ -- tony mancill <tmancill at debian.org>  Sun, 11 Sep 2022 08:00:46 -0700
+
 service-wrapper-java (3.5.50-2) unstable; urgency=medium
 
   * Update makefiles patch to address FTBFS on s390x and mipsel


=====================================
debian/libservice-wrapper-doc.lintian-overrides
=====================================
@@ -1,4 +1,5 @@
 # It would be too complicated to remove the javascript that is included in
 # javadocs, see the discussion on Debian Java mailing list starting at 
 # https://lists.debian.org/debian-java/2018/06/msg00020.html.
-embedded-javascript-library usr/share/doc/libservice-wrapper-doc/api/*/jquery*.*s *
+embedded-javascript-library please use libjs-jquery*
+


=====================================
debian/patches/riscv64-support.patch
=====================================
@@ -0,0 +1,58 @@
+Description: Add riscv64 support
+ cp Makefile-linux-arm-64.make Makefile-linux-riscv64-64.make
+Author: Eric Long <i at hack3r.moe>
+Last-Update: 2022-09-11
+Forwarded: no
+--- /dev/null
++++ b/src/c/Makefile-linux-riscv64-64.make
+@@ -0,0 +1,50 @@
++# Copyright (c) 1999, 2022 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 -g -O3 -fPIC -Wall --pedantic -DLINUX -D_FORTIFY_SOURCE=2 -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
++
++WRAPPER_LINK_OPTS = -Wl,-z,relro,-z,now
++
++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 logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c wrapper_encoding.c wrapper_jvminfo.c
++
++libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o
++
++BIN = ../../bin
++LIB = ../../lib
++
++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) $(WRAPPER_LINK_OPTS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
++
++libwrapper.so: $(libwrapper_so_OBJECTS)
++	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -pthread $(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


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@
 0004-ldflags.patch
 fix-as-needed-ppc.patch
 building_with_debug_symbols.patch
+riscv64-support.patch


=====================================
debian/source/lintian-overrides
=====================================
@@ -1,3 +1,6 @@
 # We can't use the magic URL with this package, as the tarball associated with
 # the SF project does not contain the sources.
 service-wrapper-java source: debian-watch-lacks-sourceforge-redirector *
+# this source file has long lines
+service-wrapper-java source: source-is-missing [src/java/org/tanukisoftware/wrapper/demo/html/exec_en.html]
+service-wrapper-java source: very-long-line-length-in-source-file * [src/java/org/tanukisoftware/wrapper/demo/html/exec_en.html*



View it on GitLab: https://salsa.debian.org/java-team/service-wrapper-java/-/compare/2e1d369f587fd39a52a5621f1188dd6c3168a3b7...c956839856c021b5b2fbe596af40068baf58dbee

-- 
View it on GitLab: https://salsa.debian.org/java-team/service-wrapper-java/-/compare/2e1d369f587fd39a52a5621f1188dd6c3168a3b7...c956839856c021b5b2fbe596af40068baf58dbee
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220911/ec74f303/attachment.htm>