Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Nov 2016 12:45:56 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r426710 - head/games/linux-dwarffortress
Message-ID:  <201611211245.uALCjuWW051173@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Mon Nov 21 12:45:55 2016
New Revision: 426710
URL: https://svnweb.freebsd.org/changeset/ports/426710

Log:
  Better fix for execution error. INSTALL_LIB strip(1) libraries it
  installs, at least on FreeBSD 10 this operation changes type of
  library to FreeBSD making loading library fail on runtime.

Modified:
  head/games/linux-dwarffortress/Makefile

Modified: head/games/linux-dwarffortress/Makefile
==============================================================================
--- head/games/linux-dwarffortress/Makefile	Mon Nov 21 12:37:48 2016	(r426709)
+++ head/games/linux-dwarffortress/Makefile	Mon Nov 21 12:45:55 2016	(r426710)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dwarffortress
 DISTVERSION=	0.43.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.bay12games.com/dwarves/
 PKGNAMEPREFIX=	linux-
@@ -35,6 +35,7 @@ USE_LINUX=	dri gtk2 libsndfile openal-so
 SUB_FILES=	dwarffortress
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/df_linux
+STRIP=		# breaks execution, changes library ABI to FreeBSD type
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -51,11 +52,8 @@ do-install:
 	${BRANDELF} -t Linux ${WRKSRC}/libs/Dwarf_Fortress
 	${INSTALL_PROGRAM} ${WRKSRC}/libs/Dwarf_Fortress \
 		${STAGEDIR}${PREFIX}/libexec/dwarffortress
-.for lib in libgcc_s.so.1 libgraphics.so libstdc++.so.6
-	${BRANDELF} -t Linux ${WRKSRC}/libs/${lib}
-	${INSTALL_LIB} ${WRKSRC}/libs/${lib} \
-		${STAGEDIR}${PREFIX}/libexec/dwarffortress
-.endfor
+	(cd ${WRKSRC}/libs && ${INSTALL_LIB} libgcc_s.so.1 libgraphics.so \
+		libstdc++.so.6 ${STAGEDIR}${PREFIX}/libexec/dwarffortress)
 	@${MKDIR} ${STAGEDIR}${DATADIR}/data
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} raw ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC}/data && ${COPYTREE_SHARE} "announcement art dipscript \



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