svn commit: r443040 - in head/lang: . spidermonkey38 spidermonkey38/files

[Jan Beich]

Koop Mast <kwm at FreeBSD.org> writes:

> Modified: head/lang/spidermonkey38/files/patch-bug702179
> ==============================================================================
> --- head/lang/spidermonkey24/files/patch-bug702179	Fri Jun  9 19:46:11 2017	(r443039)
> +++ head/lang/spidermonkey38/files/patch-bug702179	Fri Jun  9 20:08:54 2017	(r443040)
> @@ -1,23 +1,18 @@
> -diff --git js/src/Makefile.in js/src/Makefile.in
> -index e28160a..28ca5e8 100644
> ---- Makefile.in
> +--- Makefile.in.orig	2017-06-05 19:05:02 UTC
>  +++ Makefile.in
> -@@ -35,7 +35,6 @@ ifdef JS_SHARED_LIBRARY
> - FORCE_SHARED_LIB = 1
> - endif
> - FORCE_STATIC_LIB = 1
> --DIST_INSTALL = 1
> +@@ -208,10 +208,13 @@ endif
> + SCRIPTS = $(JS_CONFIG_NAME)
> + SDK_BINARY = $(JS_CONFIG_NAME)
>   
> - ###############################################
> - # BEGIN include sources for low-level code shared with mfbt
> -@@ -584,8 +584,8 @@ install:: $(EXPORTS_mozilla)
> - install:: $(SCRIPTS)
> - 	$(SYSINSTALL) $^ $(DESTDIR)$(bindir)
> +-$(LIBRARY_NAME).pc: js.pc
> ++$(JS_CONFIG_NAME): js-config

The patch file is named after Mozilla bug 702179 but the contents no
longer match. Did you check DTrace probes still work? Perhaps, you want
the following:

  $ cd /usr/ports/lang/spidermonkey38
  $ svn mv files/patch-bug702179 files/patch-Makefile.in
  $ svn cp ../../www/firefox-esr/files/patch-bug702179 at 413725 files/
  $ sed -i '' 's,js/src/,,' files/patch-bug702179
  $ sed -n '/install/,$p' ../spidermonkey24/files/patch-bug702179 >>files/patch-bug702179
  $ sed -i '' '/libjs_static/d' Makefile
  $ ../../Tools/scripts/bump-revision.sh .

https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-bug702179?revision=413725&view=markup
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192614#c0

> + 	cp $^ $@
>   
> --install:: $(REAL_LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
> --ifneq (,$(REAL_LIBRARY))
> -+install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
> -+ifdef DIST_INSTALL
> - 	$(SYSINSTALL) $(REAL_LIBRARY) $(DESTDIR)$(libdir)
> - 	mv -f $(DESTDIR)$(libdir)/$(REAL_LIBRARY) $(subst $(STATIC_LIBRARY_NAME),$(LIBRARY_NAME),$(DESTDIR)$(libdir)/$(REAL_LIBRARY))
> - endif
> +-install:: $(LIBRARY_NAME).pc
> ++$(JS_LIBRARY_NAME).pc: js.pc
> ++	cp $^ $@
> ++
> ++install:: $(JS_LIBRARY_NAME).pc
> + 	$(SYSINSTALL) $^ $(DESTDIR)$(prefix)/libdata/pkgconfig
> + 
> + install:: js-config.h
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 584 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20170611/f4bca9ca/attachment.sig>