Date: Fri, 26 Oct 2007 09:58:09 +0200 (CEST) From: Karel Miklav <karel@lovetemple.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Boris Samorodov <bsam@ipt.ru> Subject: ports/117522: [UPDATE] lang/gnat-gcc42 to 4.2.2, works on 7.0 now Message-ID: <200710260758.l9Q7w9Ob058672@tp.unitedpeople.net> Resent-Message-ID: <200710260800.l9Q805aw007223@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117522
>Category: ports
>Synopsis: [UPDATE] lang/gnat-gcc42 to 4.2.2, works on 7.0 now
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 26 08:00:05 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Karel Miklav
>Release: FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD bsd7.xxx.com 7.0-BETA1
FreeBSD 7.0-BETA1 #0: Sat Oct 20 00:47:13 UTC 2007
root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Port doesn't build on FreeBSD 7.0 since version 700050, when putenv(3)
behavior changed. Modifications:
- putenv(3) assumption in GNAT patched
- latest snapshot of GCC 4.3 used
- added master site (CENKES)
- PORTVERSION bumped
>How-To-Repeat:
Build on a system where $OSVERSION >= 700050.
>Fix:
diff -urN gnat-gcc43.orig/Makefile gnat-gcc43/Makefile
--- gnat-gcc43.orig/Makefile Fri Oct 19 19:43:58 2007
+++ gnat-gcc43/Makefile Thu Oct 25 07:28:17 2007
@@ -11,9 +11,9 @@
PORTVERSION= 4.3.0
PORTREVISION= 2
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_GCC} \
+MASTER_SITES= GCC/snapshots/${versionstring} \
+ CENKES:boot \
http://lovetemple.net/data/:boot
-MASTER_SITE_SUBDIR= snapshots/${versionstring}
DISTFILES= gcc-core-${versionstring}${EXTRACT_SUFX} \
gcc-ada-${versionstring}${EXTRACT_SUFX} \
gcc-testsuite-${versionstring}${EXTRACT_SUFX} \
@@ -55,7 +55,7 @@
.include <bsd.port.pre.mk>
-gcc_snapshot= 20070518
+gcc_snapshot= 20071019
versionstring= ${PORTVERSION:C/\.[0-9]*$//}-${gcc_snapshot}
srcdir= ${WRKDIR}/gcc-${versionstring}
gcc_suffix= 43
@@ -64,7 +64,7 @@
targlib= ${PREFIX}/lib/gcc-${PORTVERSION}
gcc_link= ${PREFIX}/bin/gcc${gcc_suffix}/gcc
boot_stamp= ${ARCH}-freebsd-${OSREL:C/\.[0-9.]*//}
-check_target= check
+check_target= check # XXX
PATCH_WRKSRC= ${srcdir}
@@ -99,16 +99,21 @@
@${ECHO_MSG} -n "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} "
@${ECHO_MSG} "${OSREL} target=${CONFIGURE_TARGET}"
-# Append ' [FreeBSD]' to the gcc version string.
post-patch:
- @${REINPLACE_CMD} \
+ # Append ' [FreeBSD]' to the gcc version string.
+ ${REINPLACE_CMD} \
-e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
${srcdir}/gcc/version.c
+ # New putenv(3) behavior in FreeBSD 7.
+ if [ ${OSVERSION} -ge 700050 ]; then \
+ ${REINPLACE_CMD} -e 's/#if defined (__FreeBSD__) ||/#if/' \
+ ${srcdir}/gcc/ada/env.c; \
+ fi
pre-configure:
cd ${srcdir} ; contrib/gcc_update --touch
- @${RM} -f ${srcdir}/gcc/*/*.info*
- @${MKDIR} ${CONFIGURE_WRKSRC}
+ ${RM} -f ${srcdir}/gcc/*/*.info*
+ ${MKDIR} ${CONFIGURE_WRKSRC}
post-build:
@${ECHO_MSG} -n "Consider running 'make check' before 'make install', "
diff -urN gnat-gcc43.orig/distinfo gnat-gcc43/distinfo
--- gnat-gcc43.orig/distinfo Thu May 31 23:38:55 2007
+++ gnat-gcc43/distinfo Thu Oct 25 07:28:17 2007
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.3-20070518.tar.bz2) = 176f3d054e4f360644f7da8a674144b5
-SHA256 (gcc-core-4.3-20070518.tar.bz2) = 95f9ccacec0209020403f41a0a8f51e90ec5cfacf1cee9275d677c3a25b45dc6
-SIZE (gcc-core-4.3-20070518.tar.bz2) = 17259423
-MD5 (gcc-ada-4.3-20070518.tar.bz2) = 5cb6e5507ef7d53b1f171588ba8c9720
-SHA256 (gcc-ada-4.3-20070518.tar.bz2) = 5787f9dea27e5499da4886271120ae83bb2b682a7d04940464a9645d8686ce5c
-SIZE (gcc-ada-4.3-20070518.tar.bz2) = 4981310
-MD5 (gcc-testsuite-4.3-20070518.tar.bz2) = 4a450c3558b822628b0ca362306b9ab6
-SHA256 (gcc-testsuite-4.3-20070518.tar.bz2) = a80bda0aa95367f470eb12a999cf967aabc4a9e558436beb652503898f28a7a2
-SIZE (gcc-testsuite-4.3-20070518.tar.bz2) = 4040620
+MD5 (gcc-core-4.3-20071019.tar.bz2) = b7d7cffb1f35b929401e1bd849a22323
+SHA256 (gcc-core-4.3-20071019.tar.bz2) = c1c227157b14e3154463c6cc5558edd9864fa0e0608f7114cf685aad93cfcc07
+SIZE (gcc-core-4.3-20071019.tar.bz2) = 20950304
+MD5 (gcc-ada-4.3-20071019.tar.bz2) = 1a525b0cdd4783dcca80ae6769d16235
+SHA256 (gcc-ada-4.3-20071019.tar.bz2) = 606ebefaead8241c2de4617293e80f014494737616459e9949fa624f7f1c51f1
+SIZE (gcc-ada-4.3-20071019.tar.bz2) = 5235149
+MD5 (gcc-testsuite-4.3-20071019.tar.bz2) = 2f06cded11dabb6c76658ebb370c0073
+SHA256 (gcc-testsuite-4.3-20071019.tar.bz2) = c061c08b6785795d4340a74efb3f13e7e4cc9280af8c5d20f7a6349000960823
+SIZE (gcc-testsuite-4.3-20071019.tar.bz2) = 4392343
MD5 (gnat-gcc41-boot-i386-freebsd-4.tbz) = a9848cbeb6a0dca57cbe312e1546b79e
SIZE (gnat-gcc41-boot-i386-freebsd-4.tbz) = 11508394
MD5 (gnat-gcc41-boot-i386-freebsd-5.tbz) = e439eaefcafdf6056896a16a89671a9e
diff -urN gnat-gcc43.orig/files/patch-gengtype-yacc.y gnat-gcc43/files/patch-gengtype-yacc.y
--- gnat-gcc43.orig/files/patch-gengtype-yacc.y Thu May 31 23:38:55 2007
+++ gnat-gcc43/files/patch-gengtype-yacc.y Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
---- gcc/gengtype-yacc.y.orig Fri Sep 20 00:33:24 2002
-+++ gcc/gengtype-yacc.y Tue Apr 22 09:11:27 2003
-@@ -24,6 +24,9 @@
- #include "system.h"
- #include "gengtype.h"
- #define YYERROR_VERBOSE
-+
-+#define malloc xmalloc
-+#define realloc xrealloc
- %}
-
- %union {
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710260758.l9Q7w9Ob058672>