diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2003-12-12 16:25:25 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2003-12-12 16:25:25 +0000 |
| commit | 0fe91a205bf3c48a33c060744d627e07e45f6359 (patch) | |
| tree | def1fd6d9433d18698980c3e86ae43488ff1843f | |
| parent | - Update to 2.1.2 (diff) | |
- Fix build on non-i386 platforms.
Tested ok on: i386/stable, i386/current, amd64
Fails later on: ia64 (pluto2)
PR: ports/60176
Submitted by: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
Notes
Notes:
svn path=/head/; revision=95672
| -rw-r--r-- | shells/bash1/Makefile | 8 | ||||
| -rw-r--r-- | shells/bash1/files/patch-ah | 65 |
2 files changed, 43 insertions, 30 deletions
diff --git a/shells/bash1/Makefile b/shells/bash1/Makefile index 7002b3800c75..2270677c12bb 100644 --- a/shells/bash1/Makefile +++ b/shells/bash1/Makefile @@ -22,13 +22,7 @@ NOMANCOMPRESS= yes MAN1= bash.1 bash_builtins.1 INFO= bash -.include <bsd.port.pre.mk> - -.if ${MACHINE_ARCH} != i386 -BROKEN= "does not compile on ${MACHINE_ARCH}" -.endif - post-install: @install-info ${PREFIX}/info/bash.info ${PREFIX}/info/dir -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/shells/bash1/files/patch-ah b/shells/bash1/files/patch-ah index 3033ef25d483..40571f255852 100644 --- a/shells/bash1/files/patch-ah +++ b/shells/bash1/files/patch-ah @@ -1,5 +1,5 @@ ---- machines.h.orig Mon Dec 18 11:13:22 1995 -+++ machines.h Sun Feb 10 02:30:49 2002 +--- 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 @@ -9,27 +9,46 @@ /* This causes the Gnu malloc library (from glibc) to be used. */ /* #define USE_GNU_MALLOC_LIBRARY */ -@@ -80,6 +80,23 @@ - /* Sun Microsystems Machines */ - /* */ - /* **************************************************************** */ +@@ -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 running on a 386 or 486. */ -+#if defined (__sparc64__) && defined (__FreeBSD__) ++/* FreeBSD overrides */ ++#if defined (__sparc64__) +# define M_MACHINE "sun4u" -+# define M_OS "FreeBSD" ++#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 -+# 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 -+#endif /* __sparc64__ && __FreeBSD__ */ - - /* NetBSD running on a sparc. */ - #if defined (sparc) && defined (__NetBSD__) ++#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 |