Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Sep 2014 18:25:55 +0000 (UTC)
From:      David Naylor <dbn@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368984 - in head/emulators: i386-wine i386-wine-devel
Message-ID:  <201409221825.s8MIPtQg040796@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbn
Date: Mon Sep 22 18:25:55 2014
New Revision: 368984
URL: http://svnweb.freebsd.org/changeset/ports/368984
QAT: https://qat.redports.org/buildarchive/r368984/

Log:
  Unbreak emulators/i386-wine(-devel) builds.
  
  With the removal of REINPLACE_PLIST in r367153 building wine on FreeBSD/i386
  broke.  This was not detected in an exp-run as i386-wine is marked IGNORE
  unless WINE_CROSS_BUILD is defined (to protect the build infrastructure and
  avoid confusion).
  
  PR:	193734

Modified:
  head/emulators/i386-wine-devel/Makefile.i386
  head/emulators/i386-wine/Makefile.i386

Modified: head/emulators/i386-wine-devel/Makefile.i386
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.i386	Mon Sep 22 18:18:22 2014	(r368983)
+++ head/emulators/i386-wine-devel/Makefile.i386	Mon Sep 22 18:25:55 2014	(r368984)
@@ -31,6 +31,8 @@ IGNORE=		This port is not for consumptio
 # Hook into post-install and do some adapting to make i386 binaries work nicely
 # under FreeBSD/amd64
 post-install-script:
+	# Fix pkg-plist references
+	${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST}
 	# Install bounce script to access the 32bit executables
 	${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine
 	for i in `grep ^bin ${TMPPLIST} | xargs -n1 basename` ; do \

Modified: head/emulators/i386-wine/Makefile.i386
==============================================================================
--- head/emulators/i386-wine/Makefile.i386	Mon Sep 22 18:18:22 2014	(r368983)
+++ head/emulators/i386-wine/Makefile.i386	Mon Sep 22 18:25:55 2014	(r368984)
@@ -30,6 +30,8 @@ IGNORE=		This port is not for consumptio
 # Hook into post-install and do some adapting to make i386 binaries work nicely
 # under FreeBSD/amd64
 post-install-script:
+	# Fix pkg-plist references
+	${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST}
 	# Install bounce script to access the 32bit executables
 	${INSTALL_SCRIPT} ${.CURDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine
 	for i in `grep ^bin ${TMPPLIST} | xargs -n1 basename` ; do \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409221825.s8MIPtQg040796>