1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-05 01:55:52 +00:00

- 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)

Submitted By:	Rong-En Fan
PR:		111404
This commit is contained in:
James E. Housley 2007-04-16 09:57:25 +00:00
parent e885b2fc2f
commit e4ebf8e46f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=190099
10 changed files with 22 additions and 15 deletions

View File

@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= newlib \
${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/ \
@ -53,9 +54,9 @@ NEWLIBNAME= newlib-1.11.0
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}-

View File

@ -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"

View File

@ -233,7 +233,6 @@ lib/gcc-lib/arm-rtems/%%GCCVERSION%%/thumb/fpu/crti.o
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

View File

@ -244,7 +244,6 @@ lib/gcc-lib/i386-rtems/%%GCCVERSION%%/athlon/crtbegin.o
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

View File

@ -331,7 +331,6 @@ i960-rtems/include/sys/features.h
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

View File

@ -259,7 +259,6 @@ lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/msoft-float/crtn.o
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

View File

@ -374,7 +374,6 @@ mips-rtems/include/sys/lock.h
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

View File

@ -545,7 +545,6 @@ lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/ncrtn.o
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

View File

@ -225,7 +225,6 @@ lib/gcc-lib/sh-rtems/%%GCCVERSION%%/m4-single/libgcc.a
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

View File

@ -222,7 +222,6 @@ lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/libgcc.a
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