Saturday, May 26, 2018

aarch64 fix for www/webkit

This fixes the build on aarch64. aarch64 has libc++.so instead of
libstdc++.so, and libtool fails to find the missing library.

OK?

Index: www/webkit/patches/patch-GNUmakefile_in
===================================================================
RCS file: /cvs/openbsd/ports/www/webkit/patches/patch-GNUmakefile_in,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 patch-GNUmakefile_in
--- www/webkit/patches/patch-GNUmakefile_in 16 Mar 2016 07:10:57 -0000 1.40
+++ www/webkit/patches/patch-GNUmakefile_in 26 May 2018 12:15:17 -0000
@@ -6,8 +6,9 @@ $OpenBSD: patch-GNUmakefile_in,v 1.40 20
(on Source/JavaScriptCore/runtime/NumberPrototype.cpp)
- chunk 6->9 : fix variable quoting to properly install doc in a versionned dir

---- GNUmakefile.in.orig Mon Mar 14 08:37:14 2016
-+++ GNUmakefile.in Tue Mar 15 08:11:20 2016
+Index: GNUmakefile.in
+--- GNUmakefile.in.orig
++++ GNUmakefile.in
@@ -12541,11 +12541,11 @@ am__v_P_0 = false
am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
@@ -56,7 +57,27 @@ $OpenBSD: patch-GNUmakefile_in,v 1.40 20
am__v_CXXLD_1 =
SOURCES = $(Libraries_WebExtensions_libWebExtensionTest_la_SOURCES) \
$(Libraries_WebExtensions_libWebProcessTest_la_SOURCES) \
-@@ -72944,7 +72944,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
+@@ -23332,8 +23332,7 @@ Programs_minidom_LDADD = \
+ libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(WINMM_LIBS) \
+ -lm \
+- -lpthread \
+- -lstdc++
++ -lpthread
+
+ Programs_minidom_LDFLAGS = \
+ -no-install
+@@ -23355,8 +23354,7 @@ Programs_LLIntOffsetsExtractor_LDADD = \
+ $(GLIB_LIBS) \
+ $(WINMM_LIBS) \
+ -lm \
+- -lpthread \
+- -lstdc++
++ -lpthread
+
+ Programs_LLIntOffsetsExtractor_LDFLAGS = \
+ -no-install
+@@ -72944,7 +72942,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS) $(CPPFLAGS) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberObject.lo `test -f 'Source/JavaScriptCore/runtime/NumberObject.cpp' || echo '$(srcdir)/'`Source/JavaScriptCore/runtime/NumberObject.cpp

Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo: Source/JavaScriptCore/runtime/NumberPrototype.cpp
@@ -65,7 +86,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.40 20
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Tpo Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/JavaScriptCore/runtime/NumberPrototype.cpp' object='Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@@ -82517,8 +82517,8 @@ install-data-local:
+@@ -82517,8 +82515,8 @@ install-data-local:
@ENABLE_WEBKIT1_TRUE@ then echo 1>&2 'No documentation to install' ; \
@ENABLE_WEBKIT1_TRUE@ else \
@ENABLE_WEBKIT1_TRUE@ DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
@@ -76,7 +97,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.40 20
@ENABLE_WEBKIT1_TRUE@ else \
@ENABLE_WEBKIT1_TRUE@ installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk"; \
@ENABLE_WEBKIT1_TRUE@ fi; \
-@@ -82527,9 +82527,9 @@ install-data-local:
+@@ -82527,9 +82525,9 @@ install-data-local:
@ENABLE_WEBKIT1_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \
@ENABLE_WEBKIT1_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \
@ENABLE_WEBKIT1_TRUE@ done; \
@@ -88,7 +109,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.40 20
@ENABLE_WEBKIT1_TRUE@ fi; \
@ENABLE_WEBKIT1_TRUE@ fi
@ENABLE_WEBKIT2_TRUE@ @installfiles=`echo ./Documentation/webkit2gtk/html/*`; \
-@@ -82557,8 +82557,8 @@ install-data-local:
+@@ -82557,8 +82555,8 @@ install-data-local:
then echo 1>&2 'No documentation to install' ; \
else \
DOC_MODULE_VERSION=`cat ./Documentation/webkitdomgtk/version.xml`; \
@@ -99,7 +120,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.40 20
else \
installdir="$(DESTDIR)$(HTML_DIR)/webkitdomgtk"; \
fi; \
-@@ -82567,9 +82567,9 @@ install-data-local:
+@@ -82567,9 +82565,9 @@ install-data-local:
echo ' $(INSTALL_DATA) '$$i ; \
$(INSTALL_DATA) $$i $${installdir}; \
done; \
Index: www/webkit/patches/patch-Source_JavaScriptCore_GNUmakefile_am
===================================================================
RCS file: www/webkit/patches/patch-Source_JavaScriptCore_GNUmakefile_am
diff -N www/webkit/patches/patch-Source_JavaScriptCore_GNUmakefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/webkit/patches/patch-Source_JavaScriptCore_GNUmakefile_am 26 May 2018 12:15:17 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: Source/JavaScriptCore/GNUmakefile.am
+--- Source/JavaScriptCore/GNUmakefile.am.orig
++++ Source/JavaScriptCore/GNUmakefile.am
+@@ -142,8 +142,7 @@ Programs_minidom_LDADD = \
+ libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(WINMM_LIBS) \
+ -lm \
+- -lpthread \
+- -lstdc++
++ -lpthread
+
+ Programs_minidom_LDFLAGS = \
+ -no-install
+@@ -165,8 +164,7 @@ Programs_LLIntOffsetsExtractor_LDADD = \
+ $(GLIB_LIBS) \
+ $(WINMM_LIBS) \
+ -lm \
+- -lpthread \
+- -lstdc++
++ -lpthread
+
+ Programs_LLIntOffsetsExtractor_LDFLAGS = \
+ -no-install


--
There are two ways to write error-free programs. Only the third one
works.

No comments:

Post a Comment