diff options
| author | joerg <joerg@pkgsrc.org> | 2013-07-02 12:17:30 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-07-02 12:17:30 +0000 |
| commit | 58a54d7f6ecdcf50941e930a9a429c71875d4657 (patch) | |
| tree | 0f8c47ed9876bee1c78f1f090a955c9cb72a3278 /editors | |
| parent | e9ec264bf475c44fc04fab5d0f3d5fa006c32d10 (diff) | |
| download | pkgsrc-58a54d7f6ecdcf50941e930a9a429c71875d4657.tar.gz | |
Don't try to guess the compiler type based on the name. Fix assembler
constraint. Disable integrated assembler for clang due to the misuse.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/biew/Makefile | 6 | ||||
| -rw-r--r-- | editors/biew/distinfo | 4 | ||||
| -rw-r--r-- | editors/biew/patches/patch-biewlib_sysdep_x86__64_aclib__template.c | 13 | ||||
| -rw-r--r-- | editors/biew/patches/patch-configure | 21 |
4 files changed, 42 insertions, 2 deletions
diff --git a/editors/biew/Makefile b/editors/biew/Makefile index 5219ef4caeb..4a38bca8d91 100644 --- a/editors/biew/Makefile +++ b/editors/biew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/06/30 13:39:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.24 2013/07/02 12:17:30 joerg Exp $ # DISTNAME= biew-${BIEWVER:S/.//g}-src @@ -22,6 +22,10 @@ MAKE_FILE= makefile CONFIGURE_ARGS+= --prefix=${PREFIX} +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CFLAGS+= -no-integrated-as +.endif LIBS.SunOS+= -lrt MAKE_ENV+= OS_LIBS=${LIBS:Q} diff --git a/editors/biew/distinfo b/editors/biew/distinfo index d2ade589a48..67b5c55433f 100644 --- a/editors/biew/distinfo +++ b/editors/biew/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.8 2013/06/30 13:39:05 ryoon Exp $ +$NetBSD: distinfo,v 1.9 2013/07/02 12:17:30 joerg Exp $ SHA1 (biew-610-src.tar.bz2) = 332b45580cdee134ee42c48bec652fcba96cd99a RMD160 (biew-610-src.tar.bz2) = c728c8e165c2e16edcc4c25ddef063379b32049d Size (biew-610-src.tar.bz2) = 860517 bytes SHA1 (patch-aa) = 01be55a0850bce93bddea0a01de5e79d088ffe1f +SHA1 (patch-biewlib_sysdep_x86__64_aclib__template.c) = aa7f33ab453a1b742a8ea6c6209b66d76f758154 +SHA1 (patch-configure) = 89f8b10c4360e96c1e067ab0f386bce97428a73d diff --git a/editors/biew/patches/patch-biewlib_sysdep_x86__64_aclib__template.c b/editors/biew/patches/patch-biewlib_sysdep_x86__64_aclib__template.c new file mode 100644 index 00000000000..e4885c5196c --- /dev/null +++ b/editors/biew/patches/patch-biewlib_sysdep_x86__64_aclib__template.c @@ -0,0 +1,13 @@ +$NetBSD: patch-biewlib_sysdep_x86__64_aclib__template.c,v 1.1 2013/07/02 12:17:30 joerg Exp $ + +--- biewlib/sysdep/x86_64/aclib_template.c.orig 2013-07-01 19:27:11.000000000 +0000 ++++ biewlib/sysdep/x86_64/aclib_template.c +@@ -441,7 +441,7 @@ static void __FASTCALL__ RENAME(ShortsTo + ::"r"(srcptr):"memory"); + nlimit--; + __asm __volatile("packuswb (%0), %%xmm0\n\t" +- ::"g"(&srcptr[REGMM_SIZE]):"memory"); ++ ::"r"(&srcptr[REGMM_SIZE]):"memory"); + srcptr+=step*2; + __asm __volatile("movdqa %%xmm0, (%0)\n\t" + ::"r"(destbuffptr):"memory"); diff --git a/editors/biew/patches/patch-configure b/editors/biew/patches/patch-configure new file mode 100644 index 00000000000..cfee02a2497 --- /dev/null +++ b/editors/biew/patches/patch-configure @@ -0,0 +1,21 @@ +$NetBSD: patch-configure,v 1.1 2013/07/02 12:17:30 joerg Exp $ + +--- configure.orig 2013-07-01 13:23:18.000000000 +0000 ++++ configure +@@ -500,16 +500,6 @@ _cdefos="-DDATADIR='\"$_datadir\"'" + cc_name=`$_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1` + cc_version=`$_cc -dumpversion` + +-echocheck "C compiler name" +-echores $cc_name +-case $cc_name in +- gcc) +- ;; +- *) +- die "Unknown compiler name $cc_name. Project required GCC" +- ;; +-esac +- + echocheck "C compiler version" + echores $cc_version + case $cc_version in |