diff options
author | arved <arved@FreeBSD.org> | 2004-04-13 23:35:16 +0800 |
---|---|---|
committer | arved <arved@FreeBSD.org> | 2004-04-13 23:35:16 +0800 |
commit | 6b0c928bb99900930d9c61b1a43589950db3a01b (patch) | |
tree | 7f4537ff6b808cba3bf2813dbb5e3e00b77bdf68 /audio/vsound | |
parent | bde83dc23f704cfef475eccf42598d852b776f9b (diff) | |
download | freebsd-ports-gnome-6b0c928bb99900930d9c61b1a43589950db3a01b.tar.gz freebsd-ports-gnome-6b0c928bb99900930d9c61b1a43589950db3a01b.tar.zst freebsd-ports-gnome-6b0c928bb99900930d9c61b1a43589950db3a01b.zip |
Fix build on amd64 (and probably on ia64), by fixing path to endian.h
Respect CFLAGS
Diffstat (limited to 'audio/vsound')
-rw-r--r-- | audio/vsound/Makefile | 4 | ||||
-rw-r--r-- | audio/vsound/files/patch-configure | 46 | ||||
-rw-r--r-- | audio/vsound/files/patch-vsound.c | 16 |
3 files changed, 62 insertions, 4 deletions
diff --git a/audio/vsound/Makefile b/audio/vsound/Makefile index 79f41febdb4d..9d26dcb7df12 100644 --- a/audio/vsound/Makefile +++ b/audio/vsound/Makefile @@ -20,10 +20,6 @@ USE_LIBTOOL_VER= 13 .include <bsd.port.pre.mk> -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" -BROKEN= "Does not compile on ia64 or amd64" -.endif - .if !defined(NOPORTDOCS) post-install: @${MKDIR} ${DOCSDIR} diff --git a/audio/vsound/files/patch-configure b/audio/vsound/files/patch-configure new file mode 100644 index 000000000000..b45e15c16de0 --- /dev/null +++ b/audio/vsound/files/patch-configure @@ -0,0 +1,46 @@ +--- configure.orig Sun Feb 11 07:48:58 2001 ++++ configure Tue Apr 13 17:11:28 2004 +@@ -1183,21 +1194,21 @@ + echo "$ac_t""$CPP" 1>&6 + + +-for ac_hdr in endian.h ++for ac_hdr in sys/endian.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:1191: checking for $ac_hdr" >&5 ++echo "configure:1202: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1196 "configure" ++#line 1207 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -1233,7 +1244,7 @@ + ac_cv_cpu_endian_ness="unknown" + + case "$target_cpu" in +- alpha* | i?86 ) ++ alpha* | i?86 | ia64* | amd64* ) + ac_cv_cpu_endian_ness="little" + ;; + +@@ -1941,7 +1952,7 @@ + fi + + if test "$ac_cv_prog_gcc" = yes ; then +- CFLAGS="-g -O2 -Wall -Wstrict-prototypes -pipe" ++ CFLAGS="-g $CFLAGS -Wall -Wstrict-prototypes -pipe" + fi + + if test "$ac_arg_debug" = yes; then diff --git a/audio/vsound/files/patch-vsound.c b/audio/vsound/files/patch-vsound.c new file mode 100644 index 000000000000..65aed69135b3 --- /dev/null +++ b/audio/vsound/files/patch-vsound.c @@ -0,0 +1,16 @@ +--- vsound.c.orig Tue Apr 13 16:52:15 2004 ++++ vsound.c Tue Apr 13 17:01:30 2004 +@@ -70,11 +70,11 @@ + /*------------------------------------------------------------------------------ + ** Macros to handle big/little endian issues. + */ +-#if HAVE_ENDIAN_H ++#ifdef HAVE_ENDIAN_H + /* This is the best way to do it. Unfortunately Sparc Solaris (and + ** possibly others) don't have <endian.h> + */ +- #include <endian.h> ++ #include <sys/endian.h> + #if (__BYTE_ORDER == __LITTLE_ENDIAN) + #define CPU_IS_LITTLE_ENDIAN 1 + #define CPU_IS_BIG_ENDIAN 0 |