diff options
| author | joerg <joerg@pkgsrc.org> | 2013-09-10 14:37:50 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-09-10 14:37:50 +0000 |
| commit | 4004e87b9bcd3b354524babeed0d65f2c626da93 (patch) | |
| tree | 99d98e5703d77e9857b47bc225267257e6f0ff31 /net | |
| parent | 646cae80b6acc622aa242475496f921045e18aea (diff) | |
| download | pkgsrc-4004e87b9bcd3b354524babeed0d65f2c626da93.tar.gz | |
Recognize clang.
Diffstat (limited to 'net')
| -rw-r--r-- | net/ser/distinfo | 4 | ||||
| -rw-r--r-- | net/ser/patches/patch-aa | 28 |
2 files changed, 26 insertions, 6 deletions
diff --git a/net/ser/distinfo b/net/ser/distinfo index cb6836347d5..f1aa2253cf9 100644 --- a/net/ser/distinfo +++ b/net/ser/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2011/03/24 05:27:49 obache Exp $ +$NetBSD: distinfo,v 1.6 2013/09/10 14:37:50 joerg Exp $ SHA1 (ser-0.8.14_src.tar.gz) = 91553951247506850d66da25819333b61b150d1d RMD160 (ser-0.8.14_src.tar.gz) = 72c3a0793f3dd88584ee65b3751ccf8a3776f840 Size (ser-0.8.14_src.tar.gz) = 1551881 bytes -SHA1 (patch-aa) = 1bfb2ea58ab399b836a9f18a829fb51e6453b8e4 +SHA1 (patch-aa) = 95971192dea5bee4120b4db3b2f0c7810385bb6e SHA1 (patch-ab) = 871de5c826853381eb5b6889d8e3d8b2f310dc6b SHA1 (patch-ac) = ece24eec7175c1396d76e2b85ff69a4b995e541e SHA1 (patch-ad) = 54fc24c84cc4c3261f1b40faa2124ef5506e5e00 diff --git a/net/ser/patches/patch-aa b/net/ser/patches/patch-aa index 9c000fed61c..e1672d62458 100644 --- a/net/ser/patches/patch-aa +++ b/net/ser/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2011/03/20 11:46:34 obache Exp $ +$NetBSD: patch-aa,v 1.5 2013/09/10 14:37:50 joerg Exp $ --- Makefile.defs.orig 2004-07-27 11:38:33.000000000 +0000 +++ Makefile.defs @@ -57,7 +57,27 @@ $NetBSD: patch-aa,v 1.4 2011/03/20 11:46:34 obache Exp $ #set some vars from the environment (and not make builtins) CC := $(shell echo "$${CC}") -@@ -384,6 +395,10 @@ ifeq ($(ARCH), i386) +@@ -173,6 +184,19 @@ ifneq (,$(findstring gcc, $(CC_LONGVER)) + 's/3\../3.0/') + endif + ++ifneq (,$(findstring clang, $(CC_LONGVER))) ++ CC_NAME=gcc ++ CC_VER=$(CC) $(shell $(CC) --version|head -n 1| \ ++ sed -e 's/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/' -e 's/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/') ++ # sun sed is a little brain damaged => this complicated expression ++ MKDEP=$(CC) -MM ++ #transform gcc version into 2.9x or 3.0 ++ CC_SHORTVER=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \ ++ sed -e 's/[^0-9]*-\(.*\)/\1/'| \ ++ sed -e 's/2\.9.*/2.9x/' -e 's/3\..\..*/3.0/' -e \ ++ 's/3\../3.0/') ++endif ++ + ifneq (, $(findstring Sun, $(CC_LONGVER))) + CC_NAME=suncc + CC_SHORTVER=$(shell echo "$(CC_LONGVER)"|head -n 1| \ +@@ -384,6 +408,10 @@ ifeq ($(ARCH), i386) use_fast_lock=yes endif @@ -68,7 +88,7 @@ $NetBSD: patch-aa,v 1.4 2011/03/20 11:46:34 obache Exp $ ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) use_fast_lock=yes -@@ -639,6 +654,7 @@ ifeq ($(CC_NAME), suncc) +@@ -639,6 +667,7 @@ ifeq ($(CC_NAME), suncc) endif endif #mode=release @@ -76,7 +96,7 @@ $NetBSD: patch-aa,v 1.4 2011/03/20 11:46:34 obache Exp $ #*FLAGS used for compiling the modules -@@ -743,6 +759,19 @@ ifeq ($(OS), netbsd) +@@ -743,6 +772,19 @@ ifeq ($(OS), netbsd) LIBS= -lfl endif |