On 2016-08-08, Landry Breuil <lan...@openbsd.org> wrote:

> xulrunner, i'm afraid wxneeded will need to be passed to linker flags..
> probably via vars in CONFIGURE_ENV or patching configure (boo!)

This marks three parts of xulrunner with wxneeded:
* xpcshell, used during the build
* xulrunner
* xulrunner-stub

I'm not sure how to test xulrunner and what the difference is between
xulrunner and xulrunner-stub.
There is also mozilla-xremote-client.  What's that for?

(I feel silly trying to fix a port I know so poorly.)

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/xulrunner/24/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile    14 Mar 2016 20:42:51 -0000      1.32
+++ Makefile    9 Aug 2016 11:36:32 -0000
@@ -8,7 +8,7 @@ MOZILLA_PROJECT =       xulrunner
 MOZILLA_DIST =         firefox
 PKGSPEC-devel =                xulrunner-devel->=24.0,<31.0
 PKGSPEC-main =         xulrunner->=24.0,<31.0
-REVISION-main =                12
+REVISION-main =                13
 REVISION-devel =       9
 
 SO_VERSION =           0.0
Index: patches/patch-js_xpconnect_shell_Makefile_in
===================================================================
RCS file: patches/patch-js_xpconnect_shell_Makefile_in
diff -N patches/patch-js_xpconnect_shell_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-js_xpconnect_shell_Makefile_in        9 Aug 2016 11:36:32 
-0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- js/xpconnect/shell/Makefile.in.orig        Mon Aug  8 22:41:50 2016
++++ js/xpconnect/shell/Makefile.in     Mon Aug  8 22:50:59 2016
+@@ -89,3 +89,7 @@ ifdef JS_READLINE
+ DEFINES += -DEDITLINE
+ LIBS += -lreadline $(JS_READLINE_EXTRA_LIBS)
+ endif
++
++ifeq ($(OS_ARCH),OpenBSD)
++LDFLAGS += -Wl,-z,wxneeded
++endif
Index: patches/patch-xulrunner_app_Makefile_in
===================================================================
RCS file: patches/patch-xulrunner_app_Makefile_in
diff -N patches/patch-xulrunner_app_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-xulrunner_app_Makefile_in     9 Aug 2016 11:36:32 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- xulrunner/app/Makefile.in.orig     Mon Aug  8 22:52:29 2016
++++ xulrunner/app/Makefile.in  Mon Aug  8 23:57:23 2016
+@@ -161,3 +161,7 @@ README_FILE = $(srcdir)/../README.xulrunner
+ libs::
+       $(INSTALL) $(IFLAGS1) $(README_FILE) $(DIST)/bin
+       $(INSTALL) $(IFLAGS1) $(topsrcdir)/LICENSE      $(DIST)/bin
++
++ifeq ($(OS_ARCH),OpenBSD)
++LDFLAGS += -Wl,-z,wxneeded
++endif
Index: patches/patch-xulrunner_stub_Makefile_in
===================================================================
RCS file: patches/patch-xulrunner_stub_Makefile_in
diff -N patches/patch-xulrunner_stub_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-xulrunner_stub_Makefile_in    9 Aug 2016 11:36:32 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- xulrunner/stub/Makefile.in.orig    Mon Aug  8 22:52:29 2016
++++ xulrunner/stub/Makefile.in Mon Aug  8 23:57:52 2016
+@@ -72,3 +72,7 @@ include $(topsrcdir)/config/rules.mk
+ ifeq ($(OS_ARCH),WINNT)
+ OS_LIBS += $(call EXPAND_LIBNAME,shell32)
+ endif
++
++ifeq ($(OS_ARCH),OpenBSD)
++LDFLAGS += -Wl,-z,wxneeded
++endif

-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to