Date: Fri, 12 Dec 2003 11:19:18 +0100 (CET) From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: linimon@FreeBSD.org Subject: ports/60176: [patch] shells/bash1: Unbreak on non-standard archs Message-ID: <200312121019.hBCAJIYN034044@menelaos.informatik.rwth-aachen.de> Resent-Message-ID: <200312121020.hBCAKF4B070601@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60176 >Category: ports >Synopsis: [patch] shells/bash1: Unbreak on non-standard archs >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Dec 12 02:20:15 PST 2003 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 4.9-STABLE i386 >Organization: Lehrstuhl für Informatik II >Environment: System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-STABLE FreeBSD 4.9-STABLE #12: Mon Dec 8 15:14:27 CET 2003 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386 >Description: Provide CFLAGS for FreeBSD on all archs, this time including ia64 & amd64. Feels like flogging a dead horse with scented shoe-laces, but should work. >How-To-Repeat: http://bento.freebsd.org/errorlogs/ia64-5-latest/bash-1.14.7.log http://bento.freebsd.org/errorlogs/amd64-5-latest/bash-1.14.7.log >Fix: Replace patch-ah: --- patch-ah begins here --- --- machines.h.orig Mon Dec 18 20:13:22 1995 +++ machines.h Fri Dec 12 11:02:59 2003 @@ -63,7 +63,7 @@ some machines, our malloc () cannot be used (because of library conflicts, for example), and for those, you should specifically #undef USE_GNU_MALLOC in the machine description. */ -#define USE_GNU_MALLOC +#undef USE_GNU_MALLOC /* This causes the Gnu malloc library (from glibc) to be used. */ /* #define USE_GNU_MALLOC_LIBRARY */ @@ -846,11 +847,6 @@ # define done386 # define M_MACHINE "i386" # define M_OS "FreeBSD" -# if __FreeBSD__ > 1 -# define SYSDEP_CFLAGS -D__BSD_4_4__ -DRLIMTYPE=quad_t -# else -# define SYSDEP_CFLAGS -DOPENDIR_NOT_ROBUST -DINT_GROUPS_ARRAY -# endif # define HAVE_SYS_SIGLIST # define HAVE_SETLINEBUF # define HAVE_GETGROUPS @@ -2390,3 +2386,30 @@ # endif /* LD_HAS_NO_DASH_L */ #endif /* UNKNOWN_MACHINE */ + +/* FreeBSD overrides */ +#if defined (__sparc64__) +# define M_MACHINE "sun4u" +#endif +#if defined (__ia64__) +# define M_MACHINE "ia64" +#endif +#if defined (__amd64__) +# define M_MACHINE "amd64" +#endif +#define M_OS "FreeBSD" +#if __FreeBSD__ > 1 +# define SYSDEP_CFLAGS -D__BSD_4_4__ -DRLIMTYPE=quad_t +#else +# define SYSDEP_CFLAGS -DOPENDIR_NOT_ROBUST -DINT_GROUPS_ARRAY +#endif +#define SYSDEP_LDFLAGS -static +#define HAVE_SYS_SIGLIST +#define HAVE_SETLINEBUF +#define HAVE_GETGROUPS +#define HAVE_VFPRINTF +#define HAVE_STRERROR +#define VOID_SIGHANDLER +#define HAVE_DIRENT +#define HAVE_STRCASECMP +#define GCC_STANDARD --- patch-ah ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312121019.hBCAJIYN034044>