From owner-svn-ports-head@freebsd.org Sun Jun 11 17:40:00 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84217D8B689; Sun, 11 Jun 2017 17:40:00 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5E56D70BEF; Sun, 11 Jun 2017 17:40:00 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id 7A2491B068; Sun, 11 Jun 2017 17:39:59 +0000 (UTC) From: Jan Beich To: Koop Mast Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r443040 - in head/lang: . spidermonkey38 spidermonkey38/files References: <201706092008.v59K8sOI058935@repo.freebsd.org> Date: Sun, 11 Jun 2017 19:39:39 +0200 In-Reply-To: <201706092008.v59K8sOI058935@repo.freebsd.org> (Koop Mast's message of "Fri, 9 Jun 2017 20:08:54 +0000 (UTC)") Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jun 2017 17:40:00 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Koop Mast writes: > Modified: head/lang/spidermonkey38/files/patch-bug702179 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/lang/spidermonkey24/files/patch-bug702179 Fri Jun 9 19:46:11 20= 17 (r443039) > +++ head/lang/spidermonkey38/files/patch-bug702179 Fri Jun 9 20:08:54 20= 17 (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 =3D 1 > - endif > - FORCE_STATIC_LIB =3D 1 > --DIST_INSTALL =3D 1 > +@@ -208,10 +208,13 @@ endif > + SCRIPTS =3D $(JS_CONFIG_NAME) > + SDK_BINARY =3D $(JS_CONFIG_NAME) >=20=20=20 > - ############################################### > - # 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@413725 files/ $ sed -i '' 's,js/src/,,' files/patch-bug702179 $ sed -n '/install/,$p' ../spidermonkey24/files/patch-bug702179 >>files/p= atch-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=3D413725&view=3Dmarkup https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D192614#c0 > + cp $^ $@ >=20=20=20 > --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_NAM= E),$(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 > +=20 > + install:: js-config.h --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQF8BAEBCgBmBQJZPYBbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3b1aMH/3RO89ZQ5wd4TWOnziQyqgOF JW19MqTtccOBLginWC/seLbGyxIj/RdiEtAZCMQiPcwWNRtGgtG1b3AS2UgoqtxW 5rTLSZL4SGWHq4mCLFGlG7Q0ek/n7jUdNmgjwKuWfTKMubgpUtHqNiNGZ5KBHS/h KkjyHXe+FEiCoHlCINXBrUHB3IIOua0yd01CMDBiesip6rOPkHU1zyxPZ+vMvGNB bYemceCnyDJjcOfoyErUZAz4BLwdZSg9PNpz/ckEgxokjq0isUxFkj8WqPgb1pvE X/Odw1iRYUQvMwHqbSsS55w0oqarF9Fg37BM/8wBac6uySw79etk4kxA0j/21R8= =JBAT -----END PGP SIGNATURE----- --=-=-=--