aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorantoine <antoine@FreeBSD.org>2014-09-12 03:44:48 +0800
committerantoine <antoine@FreeBSD.org>2014-09-12 03:44:48 +0800
commit5725432e95f86356ee1e727e243e869bc9ce65e4 (patch)
tree0ead1937296fdb25098794e089b1d152275844c8 /devel
parent3fb66bf1cf21a35bb2cbc3c67b49fb1892e083a9 (diff)
downloadfreebsd-ports-gnome-5725432e95f86356ee1e727e243e869bc9ce65e4.tar.gz
freebsd-ports-gnome-5725432e95f86356ee1e727e243e869bc9ce65e4.tar.zst
freebsd-ports-gnome-5725432e95f86356ee1e727e243e869bc9ce65e4.zip
Allow staging as regular user and don't violate stagedir
Diffstat (limited to 'devel')
-rw-r--r--devel/zpu-binutils/Makefile9
-rw-r--r--devel/zpu-binutils/files/install.sh2
-rw-r--r--devel/zpu-binutils/files/patch-binutils_Makefile.in9
3 files changed, 2 insertions, 18 deletions
diff --git a/devel/zpu-binutils/Makefile b/devel/zpu-binutils/Makefile
index fc8bc81717cb..523fd1310775 100644
--- a/devel/zpu-binutils/Makefile
+++ b/devel/zpu-binutils/Makefile
@@ -13,6 +13,7 @@ COMMENT= ZPU toolchain
LICENSE= GPLv2
WRKSRC= ${WRKDIR}/${DISTNAME}/toolchain
+INSTALL_WRKSRC= ${WRKSRC}/build
MANDIRS= ${PREFIX}/zpu/man
USES= gettext gmake
@@ -21,14 +22,8 @@ INFO= zpu/as zpu/bfd zpu/binutils zpu/configure zpu/ld zpu/standards
post-patch:
@${REINPLACE_CMD} -e 's/%%CC%%/${CC}/' ${WRKSRC}/build.sh
- @${CP} ${FILESDIR}/install.sh ${WRKSRC}
- @${REINPLACE_CMD} -e 's|%%GMAKE%%|${MAKE_CMD}|g' ${WRKSRC}/build.sh \
- ${WRKSRC}/install.sh
+ @${REINPLACE_CMD} -e 's|%%GMAKE%%|${MAKE_CMD}|g' ${WRKSRC}/build.sh
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/build.sh
- @${REINPLACE_CMD} -e 's|%%DESTDIR%%|${STAGEDIR}|g' ${WRKSRC}/binutils/Makefile.in
-
-do-install:
- @cd ${WRKSRC} && ${SH} install.sh
do-build:
@cd ${WRKSRC} && ${SH} build.sh
diff --git a/devel/zpu-binutils/files/install.sh b/devel/zpu-binutils/files/install.sh
deleted file mode 100644
index d2ff95ae4186..000000000000
--- a/devel/zpu-binutils/files/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cd build
-%%GMAKE%% install
diff --git a/devel/zpu-binutils/files/patch-binutils_Makefile.in b/devel/zpu-binutils/files/patch-binutils_Makefile.in
index 79aa587a94d9..1ee9174ab707 100644
--- a/devel/zpu-binutils/files/patch-binutils_Makefile.in
+++ b/devel/zpu-binutils/files/patch-binutils_Makefile.in
@@ -11,12 +11,3 @@
CXX_FOR_BUILD = $(CXX)
-@@ -385,7 +385,7 @@
-
- # Flags to pass down to all sub-makes.
- BASE_FLAGS_TO_PASS = \
-- "DESTDIR=$(DESTDIR)" \
-+ "DESTDIR=%%DESTDIR%%" \
- "RPATH_ENVVAR=$(RPATH_ENVVAR)" \
- "TARGET_SUBDIR=$(TARGET_SUBDIR)" \
- "bindir=$(bindir)" \