Date: Mon, 9 Apr 2007 19:05:09 +0800 (CST) From: Rong-En Fan <rafan@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jeh@FreeBSD.org Subject: ports/111404: [PATCH] devel/i386-rtems-gcc: fix build Message-ID: <200704091105.l39B59bY085155@svm.csie.ntu.edu.tw> Resent-Message-ID: <200704091110.l39BA2t0056536@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111404
>Category: ports
>Synopsis: [PATCH] devel/i386-rtems-gcc: fix build
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 09 11:10:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Rong-En Fan
>Release: FreeBSD 6.2-STABLE amd64
>Organization:
NTU CSIE
>Environment:
>Description:
- Fix build by explicitly tell configure how to correctly link
gettext
- Add extra empty line between PATCH_SITES and DISTFILES to make
portlint(1) happy
- Use += for *_DEPENDS after pre.mk to per portlint(1)
Port maintainer (jeh@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- i386-rtems-gcc-3.2.3_4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/i386-rtems-gcc/Makefile,v
retrieving revision 1.49
diff -u -u -r1.49 Makefile
--- Makefile 17 Aug 2006 20:43:02 -0000 1.49
+++ Makefile 9 Apr 2007 11:03:22 -0000
@@ -15,6 +15,7 @@
${PORTNAME}/${GCCNAME}/:gcc
DISTFILES= ${NEWLIBNAME}.tar.gz \
${GCCNAME}.tar.gz:gcc
+
PATCHFILES= ${GCCNAME}-rtems-20030507a.diff \
${NEWLIBNAME}-rtems-20030605.diff
PATCH_SITES= ftp://ftp.rtems.com/pub/rtems/snapshots/c_tools/source/ \
@@ -51,9 +52,9 @@
PLIST= ${PKGDIR}/pkg-plist.${LCLTARGET}
USE_GETTEXT= yes
-BUILD_DEPENDS= ${LCLTARGET}-as:${PORTSDIR}/devel/${LCLTARGET}-binutils \
+BUILD_DEPENDS+= ${LCLTARGET}-as:${PORTSDIR}/devel/${LCLTARGET}-binutils \
${LCLTARGET}-ld:${PORTSDIR}/devel/${LCLTARGET}-binutils
-RUN_DEPENDS= ${LCLTARGET}-as:${PORTSDIR}/devel/${LCLTARGET}-binutils \
+RUN_DEPENDS+= ${LCLTARGET}-as:${PORTSDIR}/devel/${LCLTARGET}-binutils \
${LCLTARGET}-ld:${PORTSDIR}/devel/${LCLTARGET}-binutils
PKGNAMEPREFIX= ${LCLTARGET}-
Index: pkg-plist.arm-rtems
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/i386-rtems-gcc/pkg-plist.arm-rtems,v
retrieving revision 1.9
diff -u -u -r1.9 pkg-plist.arm-rtems
--- pkg-plist.arm-rtems 31 May 2004 07:55:40 -0000 1.9
+++ pkg-plist.arm-rtems 9 Apr 2007 11:03:22 -0000
@@ -233,7 +233,6 @@
lib/gcc-lib/arm-rtems/%%GCCVERSION%%/thumb/fpu/crtn.o
lib/gcc-lib/arm-rtems/%%GCCVERSION%%/jc1
lib/gcc-lib/arm-rtems/%%GCCVERSION%%/jvgenmain
-lib/charset.alias
share/locale/fr/LC_MESSAGES/gcc.mo
share/locale/tr/LC_MESSAGES/gcc.mo
share/locale/ja/LC_MESSAGES/gcc.mo
Index: pkg-plist.i386-rtems
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/i386-rtems-gcc/pkg-plist.i386-rtems,v
retrieving revision 1.12
diff -u -u -r1.12 pkg-plist.i386-rtems
--- pkg-plist.i386-rtems 31 May 2004 07:55:40 -0000 1.12
+++ pkg-plist.i386-rtems 9 Apr 2007 11:03:22 -0000
@@ -244,7 +244,6 @@
lib/gcc-lib/i386-rtems/%%GCCVERSION%%/athlon/crtend.o
lib/gcc-lib/i386-rtems/%%GCCVERSION%%/jc1
lib/gcc-lib/i386-rtems/%%GCCVERSION%%/jvgenmain
-lib/charset.alias
share/locale/fr/LC_MESSAGES/gcc.mo
share/locale/tr/LC_MESSAGES/gcc.mo
share/locale/ja/LC_MESSAGES/gcc.mo
Index: pkg-plist.i960-rtems
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/i386-rtems-gcc/pkg-plist.i960-rtems,v
retrieving revision 1.11
diff -u -u -r1.11 pkg-plist.i960-rtems
--- pkg-plist.i960-rtems 31 May 2004 07:55:40 -0000 1.11
+++ pkg-plist.i960-rtems 9 Apr 2007 11:03:22 -0000
@@ -331,7 +331,6 @@
i960-rtems/include/sys/sched.h
i960-rtems/include/limits.h
i960-rtems/include/pthread.h
-lib/charset.alias
share/locale/fr/LC_MESSAGES/gcc.mo
share/locale/tr/LC_MESSAGES/gcc.mo
share/locale/ja/LC_MESSAGES/gcc.mo
Index: pkg-plist.m68k-rtems
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/i386-rtems-gcc/pkg-plist.m68k-rtems,v
retrieving revision 1.11
diff -u -u -r1.11 pkg-plist.m68k-rtems
--- pkg-plist.m68k-rtems 31 May 2004 07:55:41 -0000 1.11
+++ pkg-plist.m68k-rtems 9 Apr 2007 11:03:22 -0000
@@ -259,7 +259,6 @@
lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/msoft-float/libgcc.a
lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/jc1
lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/jvgenmain
-lib/charset.alias
share/locale/fr/LC_MESSAGES/gcc.mo
share/locale/tr/LC_MESSAGES/gcc.mo
share/locale/ja/LC_MESSAGES/gcc.mo
Index: pkg-plist.mips-rtems
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/i386-rtems-gcc/pkg-plist.mips-rtems,v
retrieving revision 1.12
diff -u -u -r1.12 pkg-plist.mips-rtems
--- pkg-plist.mips-rtems 31 May 2004 07:55:41 -0000 1.12
+++ pkg-plist.mips-rtems 9 Apr 2007 11:03:22 -0000
@@ -374,7 +374,6 @@
mips-rtems/include/sys/queue.h
mips-rtems/include/sys/stdio.h
mips-rtems/include/sys/syslimits.h
-lib/charset.alias
share/locale/fr/LC_MESSAGES/gcc.mo
share/locale/tr/LC_MESSAGES/gcc.mo
share/locale/ja/LC_MESSAGES/gcc.mo
Index: pkg-plist.powerpc-rtems
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/i386-rtems-gcc/pkg-plist.powerpc-rtems,v
retrieving revision 1.12
diff -u -u -r1.12 pkg-plist.powerpc-rtems
--- pkg-plist.powerpc-rtems 23 Dec 2005 15:26:21 -0000 1.12
+++ pkg-plist.powerpc-rtems 9 Apr 2007 11:03:22 -0000
@@ -545,7 +545,6 @@
lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/crtsavres.o
lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/jc1
lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/jvgenmain
-lib/charset.alias
share/locale/fr/LC_MESSAGES/gcc.mo
share/locale/tr/LC_MESSAGES/gcc.mo
share/locale/ja/LC_MESSAGES/gcc.mo
Index: pkg-plist.sh-rtems
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/i386-rtems-gcc/pkg-plist.sh-rtems,v
retrieving revision 1.12
diff -u -u -r1.12 pkg-plist.sh-rtems
--- pkg-plist.sh-rtems 23 Dec 2005 15:26:21 -0000 1.12
+++ pkg-plist.sh-rtems 9 Apr 2007 11:03:22 -0000
@@ -225,7 +225,6 @@
lib/gcc-lib/sh-rtems/%%GCCVERSION%%/m4/libgcc.a
lib/gcc-lib/sh-rtems/%%GCCVERSION%%/jc1
lib/gcc-lib/sh-rtems/%%GCCVERSION%%/jvgenmain
-lib/charset.alias
share/locale/fr/LC_MESSAGES/gcc.mo
share/locale/tr/LC_MESSAGES/gcc.mo
share/locale/ja/LC_MESSAGES/gcc.mo
Index: pkg-plist.sparc-rtems
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/i386-rtems-gcc/pkg-plist.sparc-rtems,v
retrieving revision 1.11
diff -u -u -r1.11 pkg-plist.sparc-rtems
--- pkg-plist.sparc-rtems 31 May 2004 07:55:41 -0000 1.11
+++ pkg-plist.sparc-rtems 9 Apr 2007 11:03:22 -0000
@@ -222,7 +222,6 @@
lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/v8/libgcc.a
lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/jc1
lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/jvgenmain
-lib/charset.alias
share/locale/fr/LC_MESSAGES/gcc.mo
share/locale/tr/LC_MESSAGES/gcc.mo
share/locale/ja/LC_MESSAGES/gcc.mo
Index: files/patch-gcc::configure
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/i386-rtems-gcc/files/patch-gcc::configure,v
retrieving revision 1.1
diff -u -u -r1.1 patch-gcc::configure
--- files/patch-gcc::configure 29 Oct 2003 02:35:52 -0000 1.1
+++ files/patch-gcc::configure 9 Apr 2007 11:03:22 -0000
@@ -1,6 +1,6 @@
---- gcc-3.2.3/gcc/configure.orig Mon Feb 3 19:17:46 2003
-+++ gcc-3.2.3/gcc/configure Mon Oct 27 08:00:22 2003
-@@ -6013,7 +6017,7 @@
+--- gcc-3.2.3/gcc/configure.orig Tue Feb 4 08:17:46 2003
++++ gcc-3.2.3/gcc/configure Mon Apr 9 18:35:53 2007
+@@ -6013,7 +6013,7 @@
cat > conftest.$ac_ext <<EOF
#line 6015 "configure"
#include "confdefs.h"
@@ -9,7 +9,7 @@
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:6020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6044,7 +6048,7 @@
+@@ -6044,7 +6044,7 @@
cat > conftest.$ac_ext <<EOF
#line 6046 "configure"
#include "confdefs.h"
@@ -18,7 +18,12 @@
extern int _nl_msg_cat_cntr;
int main() {
bindtextdomain ("", "");
-@@ -6076,7 +6080,7 @@
+@@ -6072,11 +6072,11 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ gt_save_LIBS="$LIBS"
+- LIBS="$LIBS -lintl $LIBICONV"
++ LIBS="$LIBS -L%%LOCALBASE%% -lintl $LIBICONV"
cat > conftest.$ac_ext <<EOF
#line 6078 "configure"
#include "confdefs.h"
@@ -27,3 +32,12 @@
extern int _nl_msg_cat_cntr;
int main() {
bindtextdomain ("", "");
+@@ -6108,7 +6108,7 @@
+
+
+ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+- INTLLIBS="-lintl $LIBICONV"
++ INTLLIBS="-L%%LOCALBASE%% -lintl $LIBICONV"
+ fi
+
+ gt_save_LIBS="$LIBS"
--- i386-rtems-gcc-3.2.3_4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704091105.l39B59bY085155>