Page MenuHomeFreeBSD
Files F174315636

D59510.id188316.diff
No OneTemporary
Actions

D59510.id188316.diff
View Options

diff --git a/devel/freebsd-gcc14/Makefile b/devel/freebsd-gcc14/Makefile
--- a/devel/freebsd-gcc14/Makefile
+++ b/devel/freebsd-gcc14/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gcc
DISTVERSION= 14.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= GCC
PKGNAMEPREFIX= ${TARGETARCH}-
@@ -64,7 +64,6 @@
CPPFLAGS+= -DLIBCXXABI=NULL
CPPFLAGS+= -D__USE_ISOC11
-ALL_TARGET= all-gcc
INSTALL_TARGET= install-gcc
.include <bsd.port.pre.mk>
@@ -73,6 +72,8 @@
TARGET_ABI= gnueabi
BU_FLAVOR= arm_${TARGET_ABI}
BU_PREFIX= arm-${TARGET_ABI}-${OPSYS:tl}${OSREL}
+MAKE_ARGS+= AR_FOR_TARGET=${BU_PREFIX}-ar \
+ RANLIB_FOR_TARGET=${BU_PREFIX}-ranlib
.else
TARGET_ABI= unknown
BU_FLAVOR= ${TARGETARCH}
@@ -92,6 +93,8 @@
.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64"
CONFIGURE_ARGS+=--enable-multilib
+.else
+CONFIGURE_ARGS+=--disable-multilib
.endif
.if ${ARCH} == "aarch64"
@@ -116,6 +119,11 @@
PLIST+= ${.CURDIR}/pkg-plist.i386
.endif
+do-build:
+ cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} all-gcc
+ cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} configure-target-libgcc
+ cd ${BUILD_WRKSRC}/${GCC_TARGET}/libgcc && ${DO_MAKE_BUILD} libgcov.a
+
post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
${RM} ${STAGEDIR}${PREFIX}/share/info/*
@@ -128,5 +136,7 @@
${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk
+ ${INSTALL_DATA} ${BUILD_WRKSRC}/${GCC_TARGET}/libgcc/libgcov.a \
+ ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${DISTVERSION}/libgcov.a
.include <bsd.port.post.mk>
diff --git a/devel/freebsd-gcc14/pkg-plist b/devel/freebsd-gcc14/pkg-plist
--- a/devel/freebsd-gcc14/pkg-plist
+++ b/devel/freebsd-gcc14/pkg-plist
@@ -32,6 +32,7 @@
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/include/limits.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/macro_list
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders.conf
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/libgcov.a
%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gtype.state
%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ada/gcc-interface/ada-tree.def
%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/addresses.h
diff --git a/devel/freebsd-gcc15/Makefile b/devel/freebsd-gcc15/Makefile
--- a/devel/freebsd-gcc15/Makefile
+++ b/devel/freebsd-gcc15/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gcc
DISTVERSION= 15.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= GCC
PKGNAMEPREFIX= ${TARGETARCH}-
@@ -64,7 +64,6 @@
CPPFLAGS+= -DLIBCXXABI=NULL
CPPFLAGS+= -D__USE_ISOC11
-ALL_TARGET= all-gcc
INSTALL_TARGET= install-gcc
.include <bsd.port.pre.mk>
@@ -73,6 +72,8 @@
TARGET_ABI= gnueabi
BU_FLAVOR= arm_${TARGET_ABI}
BU_PREFIX= arm-${TARGET_ABI}-${OPSYS:tl}${OSREL}
+MAKE_ARGS+= AR_FOR_TARGET=${BU_PREFIX}-ar \
+ RANLIB_FOR_TARGET=${BU_PREFIX}-ranlib
.else
TARGET_ABI= unknown
BU_FLAVOR= ${TARGETARCH}
@@ -92,6 +93,8 @@
.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64"
CONFIGURE_ARGS+=--enable-multilib
+.else
+CONFIGURE_ARGS+=--disable-multilib
.endif
.if ${ARCH} == "aarch64"
@@ -116,6 +119,11 @@
PLIST+= ${.CURDIR}/pkg-plist.i386
.endif
+do-build:
+ cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} all-gcc
+ cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} configure-target-libgcc
+ cd ${BUILD_WRKSRC}/${GCC_TARGET}/libgcc && ${DO_MAKE_BUILD} libgcov.a
+
post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
${RM} ${STAGEDIR}${PREFIX}/share/info/*
@@ -128,5 +136,7 @@
${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk
+ ${INSTALL_DATA} ${BUILD_WRKSRC}/${GCC_TARGET}/libgcc/libgcov.a \
+ ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${DISTVERSION}/libgcov.a
.include <bsd.port.post.mk>
diff --git a/devel/freebsd-gcc15/pkg-plist b/devel/freebsd-gcc15/pkg-plist
--- a/devel/freebsd-gcc15/pkg-plist
+++ b/devel/freebsd-gcc15/pkg-plist
@@ -32,6 +32,7 @@
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/include/limits.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/macro_list
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders.conf
+lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/libgcov.a
%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gtype.state
%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ada/gcc-interface/ada-tree.def
%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/addresses.h

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 3, 7:54 AM (7 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40099087
Default Alt Text
D59510.id188316.diff (4 KB)

Event Timeline