diff options
| author | danfe <danfe@FreeBSD.org> | 2013-09-05 14:07:30 +0800 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2013-09-05 14:07:30 +0800 |
| commit | 19773db6fa6f7a32be9e8c859d59acb243b63aa5 (patch) | |
| tree | 07c1c5c2e72d4002358e05ac737a5d0bef978ff9 | |
| parent | 242921a31ca5c60522f7d03fd34b705dc76ff025 (diff) | |
| download | freebsd-ports-gnome-19773db6fa6f7a32be9e8c859d59acb243b63aa5.tar.gz freebsd-ports-gnome-19773db6fa6f7a32be9e8c859d59acb243b63aa5.tar.zst freebsd-ports-gnome-19773db6fa6f7a32be9e8c859d59acb243b63aa5.zip | |
- Unbreak against Clang and other strict C++ compilers
- Sanitize some post-extract commands while I'm here
Reported by: pkg-fallout
| -rw-r--r-- | devel/hp48xgcc/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/devel/hp48xgcc/Makefile b/devel/hp48xgcc/Makefile index 516544faf422..8d06c8419d33 100644 --- a/devel/hp48xgcc/Makefile +++ b/devel/hp48xgcc/Makefile @@ -26,7 +26,7 @@ USE_ZIP= yes GCC_VER= 2.7.2 GCC_DIR= ${WRKDIR}/gcc-${GCC_VER} -PLIST_SUB+= GCC_VER=${GCC_VER} +PLIST_SUB= GCC_VER=${GCC_VER} WRKSRC= ${WRKDIR}/saturn ALL_TARGET= default INSTALL_TARGET= build-lib @@ -37,10 +37,9 @@ MAKE_ARGS= GCC_SRC="${GCC_DIR}" GCC_VERSION="${GCC_VER}" \ post-extract: .SILENT # Extract GCC distribution separately because of USE_ZIP/.tar.gz conflict - cd ${WRKDIR} && ${GZIP_CMD} -dc \ - ${_DISTDIR}/gcc-${GCC_VER}.tar.gz | ${TAR} -xf - + ${TAR} xzf ${_DISTDIR}/gcc-${GCC_VER}.tar.gz -C ${WRKDIR} # Patch GCC a bit - cd ${GCC_DIR} && ${PATCH} -s < ${WRKSRC}/gcc-target/patches-${GCC_VER} + ${PATCH} -d ${GCC_DIR} -s < ${WRKSRC}/gcc-target/patches-${GCC_VER} # Prepare GCC by creating proper config symlink ${LN} -sf ../../saturn/gcc-target/config-saturn ${GCC_DIR}/config/saturn # Allow GCC to build in our environment @@ -50,6 +49,8 @@ post-extract: .SILENT ${ECHO_CMD} '#define HAVE_VPRINTF' >> ${GCC_DIR}/config/xm-freebsd.h # Do not install extra copies of GPL (we use license framework instead) ${REINPLACE_CMD} -e '/COPYING/d' ${WRKSRC}/make.pubfiles +# Unbreak against Clang and other strict C++ compilers + ${REINPLACE_CMD} -e 's/main (/int &void/' ${WRKSRC}/objdump/bool.cc do-configure: cd ${GCC_DIR} && ./configure --target=saturn-local-hp48 \ |