Sun Aug 17 06:14:21 2008 UTC ()
Use -fPIC for the shared object. Fixes broken build on amd64 and
probably others.


(dholland)
diff -r1.8 -r1.9 pkgsrc/graphics/py-gdchart/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/py-gdchart/patches/patch-aa
cvs diff -r1.8 -r1.9 pkgsrc/graphics/py-gdchart/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/py-gdchart/distinfo 2005/12/20 11:57:41 1.8
+++ pkgsrc/graphics/py-gdchart/distinfo 2008/08/17 06:14:20 1.9
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.8 2005/12/20 11:57:41 joerg Exp $ 1$NetBSD: distinfo,v 1.9 2008/08/17 06:14:20 dholland Exp $
2 2
3SHA1 (gdchart-py-0.6.tar.gz) = 20547e8550bb8c925a3b9776739f9a5e93ce8692 3SHA1 (gdchart-py-0.6.tar.gz) = 20547e8550bb8c925a3b9776739f9a5e93ce8692
4RMD160 (gdchart-py-0.6.tar.gz) = 6c8e430e53ab7adf2b83a8493afe570474532a26 4RMD160 (gdchart-py-0.6.tar.gz) = 6c8e430e53ab7adf2b83a8493afe570474532a26
5Size (gdchart-py-0.6.tar.gz) = 321891 bytes 5Size (gdchart-py-0.6.tar.gz) = 321891 bytes
6SHA1 (patch-aa) = d668c308d54aceedd09f4c5e39c5ad33f32c0e47 6SHA1 (patch-aa) = 41dff5a28491fed9e955a44e02f2003a9482f85e
7SHA1 (patch-ab) = b4acbd6a23b97056ae18ab9a91c1d5a0b2424eb2 7SHA1 (patch-ab) = b4acbd6a23b97056ae18ab9a91c1d5a0b2424eb2
cvs diff -r1.4 -r1.5 pkgsrc/graphics/py-gdchart/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/py-gdchart/patches/patch-aa 2004/08/27 06:29:08 1.4
+++ pkgsrc/graphics/py-gdchart/patches/patch-aa 2008/08/17 06:14:21 1.5
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1$NetBSD: patch-aa,v 1.4 2004/08/27 06:29:08 jlam Exp $ 1$NetBSD: patch-aa,v 1.5 2008/08/17 06:14:21 dholland Exp $
2 2
3--- Makefile.orig Fri Mar 16 19:08:18 2001 3--- Makefile.orig 2001-03-16 14:08:18.000000000 -0500
4+++ Makefile Wed Jul 2 13:09:19 2003 4+++ Makefile 2008-08-17 02:14:47.000000000 -0400
5@@ -12,10 +12,10 @@ 5@@ -12,10 +12,11 @@
6 # SO Extension for shared libs. 6 # SO Extension for shared libs.
7  7
8 HAVE_JPEG = 1 8 HAVE_JPEG = 1
9-PY_INCLUDE = -I/usr/local/include/python2.0 9-PY_INCLUDE = -I/usr/local/include/python2.0
10-LIB_DIRS = -L/usr/local/lib -L/usr/lib 10-LIB_DIRS = -L/usr/local/lib -L/usr/lib
11-GCC = gcc 11-GCC = gcc
12-CFLAGS = -Wall -fpic -O2 12-CFLAGS = -Wall -fpic -O2
13+INC_DIRS = -I${GDCHART_INCLUDE} -I$(GD_INCLUDE) -I$(PYTHON_INCLUDE) 13+INC_DIRS = -I${GDCHART_INCLUDE} -I$(GD_INCLUDE) -I$(PYTHON_INCLUDE)
14+LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib 14+LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib
15+GCC = ${CC} 15+GCC = ${CC}
16+CFLAGS ?= -Wall -fpic -O2 16+CFLAGS ?= -Wall -fpic -O2
 17+CFLAGS+=-fPIC
17  18
18 # Linux 19 # Linux
19 LD = $(GCC) -shared 20 LD = $(GCC) -shared
20@@ -31,21 +31,19 @@ 21@@ -31,21 +32,19 @@ SO = .so
21  22
22 # Shouldn't need to touch anything below this point. 23 # Shouldn't need to touch anything below this point.
23  24
24-GD = gd-1.8.4 25-GD = gd-1.8.4
25-LIBGD = $(GD)/libgd.a 26-LIBGD = $(GD)/libgd.a
26- 27-
27-GDCHART = gdchart0.10.1dev 28-GDCHART = gdchart0.10.1dev
28-LIBGDCHART = $(GDCHART)/libgdchart.a 29-LIBGDCHART = $(GDCHART)/libgdchart.a
29- 30-
30 DEFS = 31 DEFS =
31 ifeq ($(HAVE_JPEG),1) 32 ifeq ($(HAVE_JPEG),1)
32 DEFS += -DHAVE_JPEG 33 DEFS += -DHAVE_JPEG
33- LIBJPEG = -ljpeg 34- LIBJPEG = -ljpeg
@@ -37,27 +38,27 @@ $NetBSD: patch-aa,v 1.4 2004/08/27 06:29 @@ -37,27 +38,27 @@ $NetBSD: patch-aa,v 1.4 2004/08/27 06:29
37+ DEFS += -DHAVE_LIBFREETYPE 38+ DEFS += -DHAVE_LIBFREETYPE
38+ LIBS += -lfreetype 39+ LIBS += -lfreetype
39 endif 40 endif
40  41
41-CFLAGS += -I$(GDCHART) $(PY_INCLUDE) $(DEFS) 42-CFLAGS += -I$(GDCHART) $(PY_INCLUDE) $(DEFS)
42-LDFLAGS = -L$(GDCHART) -L$(GD) $(LIB_DIRS) 43-LDFLAGS = -L$(GDCHART) -L$(GD) $(LIB_DIRS)
43-LDLIBS = -lgdchart -lgd -lpng -lz $(LIBJPEG) 44-LDLIBS = -lgdchart -lgd -lpng -lz $(LIBJPEG)
44+CFLAGS += ${INC_DIRS} $(DEFS) 45+CFLAGS += ${INC_DIRS} $(DEFS)
45+LDFLAGS = $(LIB_DIRS) 46+LDFLAGS = $(LIB_DIRS)
46+LDLIBS = -lgdchart -lgd -lpng -lz $(LIBS) 47+LDLIBS = -lgdchart -lgd -lpng -lz $(LIBS)
47  48
48 TARGET = gdchart$(SO) 49 TARGET = gdchart$(SO)
49 PY_SRC = gdc_py.c 50 PY_SRC = gdc_py.c
50@@ -53,19 +51,11 @@ 51@@ -53,19 +52,11 @@ PY_OBJ = $(PY_SRC:.c=.o)
51  52
52 all: $(TARGET) 53 all: $(TARGET)
53  54
54-$(TARGET): $(LIBGD) $(LIBGDCHART) $(PY_OBJ) 55-$(TARGET): $(LIBGD) $(LIBGDCHART) $(PY_OBJ)
55+$(TARGET): $(PY_OBJ) 56+$(TARGET): $(PY_OBJ)
56 $(LD) $(PY_OBJ) $(LDFLAGS) $(LDLIBS) -o $@ 57 $(LD) $(PY_OBJ) $(LDFLAGS) $(LDLIBS) -o $@
57  58
58 $(PY_OBJ): $(PY_SRC) 59 $(PY_OBJ): $(PY_SRC)
59 $(GCC) -c $(CFLAGS) $< 60 $(GCC) -c $(CFLAGS) $<
60  61
61-$(LIBGD): 62-$(LIBGD):
62- make -C $(GD) libgd.a HAVE_JPEG=$(HAVE_JPEG) 63- make -C $(GD) libgd.a HAVE_JPEG=$(HAVE_JPEG)
63- 64-