The build system seems to expect aarch64 to be arm-64, and treats armhf
as 32bit. Update the Makefile(s) and patch to reflect this.
No REVISION because it doesn't build on aarch64, and this shouldn't
affect any other arch.
Build error: http://build-failures.rhaalovely.net/aarch64/2021-10-22/java/tanukiwrapper.log
OK?
Index: Makefile
===================================================================
RCS file: /cvs/openbsd/ports/java/tanukiwrapper/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 16 Oct 2021 08:07:39 -0000 1.23
+++ Makefile 30 Oct 2021 13:28:32 -0000
@@ -31,7 +31,7 @@ MAKE_ARCH=x86-32
.elif ${MACHINE_ARCH} == "amd64"
MAKE_ARCH=x86-64
.elif ${MACHINE_ARCH} == "aarch64"
-MAKE_ARCH=armhf-64
+MAKE_ARCH=arm-64
.elif ${MACHINE_ARCH} == "sparc64"
MAKE_ARCH=sparc-64
.endif
Index: files/Makefile-openbsd-arm-64.gmake
===================================================================
RCS file: files/Makefile-openbsd-arm-64.gmake
diff -N files/Makefile-openbsd-arm-64.gmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/Makefile-openbsd-arm-64.gmake 21 May 2021 11:51:08 -0000
@@ -0,0 +1,42 @@
+# Copyright (c) 1999, 2013 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
+
+CC = ${CC} -Wall -fPIC -pedantic -DOPENBSD -DJSW64 -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv -DUNICODE -D_UNICODE
+
+INCLUDE=$(JAVA_HOME)/include
+
+CFLAGS = ${CFLAGS} -I$(INCLUDE) -I$(INCLUDE)/openbsd
+
+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)
+ $(CC) $(wrapper_SOURCE) -lm -rdynamic -lc -pthread -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ $(CC) -shared -rdynamic -lc -pthread $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+#%.o: %.c
+# $(COMPILE) -c $(DEFS) $<
Index: files/Makefile-openbsd-armhf-64.gmake
===================================================================
RCS file: files/Makefile-openbsd-armhf-64.gmake
diff -N files/Makefile-openbsd-armhf-64.gmake
--- files/Makefile-openbsd-armhf-64.gmake 21 May 2021 11:51:08 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-# Copyright (c) 1999, 2013 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
-
-CC = ${CC} -Wall -fPIC -pedantic -DOPENBSD -DJSW64 -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv -DUNICODE -D_UNICODE
-
-INCLUDE=$(JAVA_HOME)/include
-
-CFLAGS = ${CFLAGS} -I$(INCLUDE) -I$(INCLUDE)/openbsd
-
-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)
- $(CC) $(wrapper_SOURCE) -lm -rdynamic -lc -pthread -o $(BIN)/wrapper
-
-libwrapper.so: $(libwrapper_so_OBJECTS)
- $(CC) -shared -rdynamic -lc -pthread $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-
-#%.o: %.c
-# $(COMPILE) -c $(DEFS) $<
Index: patches/patch-build_xml
===================================================================
RCS file: /cvs/openbsd/ports/java/tanukiwrapper/patches/patch-build_xml,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-build_xml
--- patches/patch-build_xml 16 Oct 2021 08:07:39 -0000 1.5
+++ patches/patch-build_xml 30 Oct 2021 13:29:49 -0000
@@ -37,7 +37,7 @@ Index: build.xml
<release-delta-extract-platform osname="linux" osarch="arm" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="openbsd" osarch="x86" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="openbsd" osarch="x86" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
-+ <release-delta-extract-platform osname="openbsd" osarch="armhf" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
++ <release-delta-extract-platform osname="openbsd" osarch="arm" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="openbsd" osarch="sparc" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
</target>
<target name="release-delta" depends="pre-release:check, release-delta:init, release-delta:extract-platforms">
--
There are three kinds of lies: Lies, Damn Lies, and Statistics.
-- Benjamin Disraeli
No comments:
Post a Comment