diff options
| author | dholland <dholland@pkgsrc.org> | 2008-08-17 08:40:50 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2008-08-17 08:40:50 +0000 |
| commit | 3ea3e10cf16dd3bb7b0903820c28a0e97102cc64 (patch) | |
| tree | 456f9e2cf11910f85ee7f8e7d16f12cea7582a92 /www/clearsilver/patches | |
| parent | 11c94766e19cd687ef6b4238c017ca62495ef9b6 (diff) | |
| download | pkgsrc-3ea3e10cf16dd3bb7b0903820c28a0e97102cc64.tar.gz | |
Use -fPIC in more places; fixes broken amd64 build and perhaps others.
Fix a long/int type mismatch hidden by use of ... and va_arg; fixes
broken LP64 builds.
Diffstat (limited to 'www/clearsilver/patches')
| -rw-r--r-- | www/clearsilver/patches/patch-ab | 18 | ||||
| -rw-r--r-- | www/clearsilver/patches/patch-ae | 19 |
2 files changed, 34 insertions, 3 deletions
diff --git a/www/clearsilver/patches/patch-ab b/www/clearsilver/patches/patch-ab index d8e09b3db1d..ceee6db2714 100644 --- a/www/clearsilver/patches/patch-ab +++ b/www/clearsilver/patches/patch-ab @@ -1,10 +1,22 @@ -$NetBSD: patch-ab,v 1.3 2006/07/28 12:26:18 rillig Exp $ +$NetBSD: patch-ab,v 1.4 2008/08/17 08:40:50 dholland Exp $ We don't need the dependencies for building the package once. Additionally, not every compiler understands the -MG option. ---- rules.mk.in.orig 2005-07-03 02:13:51.000000000 +0200 -+++ rules.mk.in 2006-07-28 13:19:38.529610934 +0200 +Also, add -fPIC to CFLAGS. It is apparently not (always?) used from +CPPFLAGS and that breaks the build. + +--- rules.mk.in.orig 2005-07-02 20:13:51.000000000 -0400 ++++ rules.mk.in 2008-08-17 03:30:01.000000000 -0400 +@@ -73,7 +73,7 @@ PYTHON = @PYTHON@ + PERL = @PERL@ + RUBY = @RUBY@ + +-CFLAGS = @CFLAGS@ -Wall -I$(NEOTONIC_ROOT) @CPPFLAGS@ ++CFLAGS = @CFLAGS@ -Wall -I$(NEOTONIC_ROOT) -fPIC @CPPFLAGS@ + CPPFLAGS = -I$(NEOTONIC_ROOT) -fPIC @CPPFLAGS@ + OUTPUT_OPTION = -o $@ + LD = $(CC) -o @@ -141,9 +141,6 @@ Makefile.depends: $(NEOTONIC_ROOT)/rules @echo "** OSNAME: $(OSTYPE)" @rm -f Makefile.depends diff --git a/www/clearsilver/patches/patch-ae b/www/clearsilver/patches/patch-ae new file mode 100644 index 00000000000..b5c9be60f87 --- /dev/null +++ b/www/clearsilver/patches/patch-ae @@ -0,0 +1,19 @@ +$NetBSD: patch-ae,v 1.1 2008/08/17 08:40:50 dholland Exp $ + +Fix type mismatch through va_arg() and resulting nasal demons. + +--- cs/csparse.c.orig 2005-06-30 21:04:34.000000000 -0400 ++++ cs/csparse.c 2008-08-17 04:36:18.000000000 -0400 +@@ -3359,9 +3359,9 @@ static NEOERR * _builtin_str_slice (CSPA + NEOERR *err; + char *s = NULL; + char *slice; +- int b = 0; +- int e = 0; +- int len; ++ long int b = 0; ++ long int e = 0; ++ long int len; + + result->op_type = CS_TYPE_STRING; + result->s = ""; |