Gentoo Archives: gentoo-commits

From: "Aaron Swenson (titanofold)" <titanofold@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/postgis/files: postgis-1.5-ldflags.patch postgis-2.0-ldflags.patch
Date: Wed, 30 Jan 2013 14:47:03
Message-Id: 20130130144658.9CA242171D@flycatcher.gentoo.org
1 titanofold 13/01/30 14:46:58
2
3 Added: postgis-1.5-ldflags.patch postgis-2.0-ldflags.patch
4 Log:
5 Version bumps. Fixes bugs 339116, 423349, and 454276.
6
7 (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)
8
9 Revision Changes Path
10 1.1 dev-db/postgis/files/postgis-1.5-ldflags.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/files/postgis-1.5-ldflags.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/files/postgis-1.5-ldflags.patch?rev=1.1&content-type=text/plain
14
15 Index: postgis-1.5-ldflags.patch
16 ===================================================================
17 diff -Naurw postgis-1.5.8.orig/loader/Makefile.in postgis-1.5.8/loader/Makefile.in
18 --- postgis-1.5.8.orig/loader/Makefile.in 2010-09-10 20:44:05.000000000 +0000
19 +++ postgis-1.5.8/loader/Makefile.in 2013-01-30 14:31:01.189692941 +0000
20 @@ -79,16 +79,16 @@
21 $(CC) $(CFLAGS) $(ICONV_CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
22
23 $(PGSQL2SHP): shpopen.o dbfopen.o safileio.o getopt.o pgsql2shp.o $(LIBLWGEOM)
24 - $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm -o $@
25 + $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm -o $@
26
27 $(SHP2PGSQL-CLI): stringbuffer.o shpopen.o dbfopen.o safileio.o getopt.o shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
28 - $(CC) $(CFLAGS) $^ -o $@ $(ICONV_LDFLAGS) -lm
29 + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(ICONV_LDFLAGS) -lm
30
31 shp2pgsql-gui.o: shp2pgsql-gui.c
32 $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) $(GTK_CFLAGS) -o $@ -c shp2pgsql-gui.c
33
34 $(SHP2PGSQL-GUI): stringbuffer.o shpopen.o dbfopen.o safileio.o shp2pgsql-core.o shp2pgsql-gui.o getopt.o $(LIBLWGEOM) $(GTK_WIN32_RES)
35 - $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm
36 + $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm
37
38 installdir:
39 @mkdir -p $(DESTDIR)$(bindir)
40 @@ -106,4 +106,3 @@
41
42 clean:
43 @rm -f *.o $(SHP2PGSQL-CLI) $(PGSQL2SHP) $(GTK_WIN32_RES)
44 -
45
46
47
48 1.1 dev-db/postgis/files/postgis-2.0-ldflags.patch
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/files/postgis-2.0-ldflags.patch?rev=1.1&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/files/postgis-2.0-ldflags.patch?rev=1.1&content-type=text/plain
52
53 Index: postgis-2.0-ldflags.patch
54 ===================================================================
55 diff -Naurw postgis-2.0.2.orig/loader/Makefile.in postgis-2.0.2/loader/Makefile.in
56 --- postgis-2.0.2.orig/loader/Makefile.in 2012-03-21 21:36:59.000000000 +0000
57 +++ postgis-2.0.2/loader/Makefile.in 2013-01-29 21:44:12.566318760 +0000
58 @@ -97,11 +97,11 @@
59
60 $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
61 $(LIBTOOL) --mode=link \
62 - $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
63 + $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
64
65 $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
66 $(LIBTOOL) --mode=link \
67 - $(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
68 + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
69
70 shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
71 $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
72 @@ -109,7 +109,7 @@
73 $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
74 $(LIBTOOL) --mode=link \
75 $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
76 - $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
77 + $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
78
79 installdir:
80 @mkdir -p $(DESTDIR)$(bindir)