| 1 |
scarabeus 11/05/02 10:16:17 |
| 2 |
|
| 3 |
Added: 6.0.0_rc1-ldflags.patch |
| 4 |
Log: |
| 5 |
Version bump to 5.6.6 and 6.0.0_rc1 releases. (did not test all options so some might fail) |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 6.0.0_rc1-ldflags.patch |
| 16 |
=================================================================== |
| 17 |
diff -urN mapserver-6.0.0-rc1.old//Makefile.in mapserver-6.0.0-rc1/Makefile.in |
| 18 |
--- mapserver-6.0.0-rc1.old//Makefile.in 2011-05-02 12:10:03.000000000 +0200 |
| 19 |
+++ mapserver-6.0.0-rc1/Makefile.in 2011-05-02 12:12:46.000000000 +0200 |
| 20 |
@@ -264,7 +264,7 @@ |
| 21 |
# STATIC_LIBS is full filename with path of libs that will be statically linked |
| 22 |
STATIC_LIBS= $(GD_STATIC) |
| 23 |
|
| 24 |
-EXE_LDFLAGS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) |
| 25 |
+EXE_LIBS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) |
| 26 |
|
| 27 |
RM= /bin/rm -f |
| 28 |
|
| 29 |
@@ -351,59 +351,59 @@ |
| 30 |
&& ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED) |
| 31 |
|
| 32 |
shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h |
| 33 |
- $(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf |
| 34 |
+ $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS) |
| 35 |
|
| 36 |
shp2img: $(LIBMAP_STATIC) shp2img.o mapserver.h |
| 37 |
- $(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img |
| 38 |
+ $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS) |
| 39 |
|
| 40 |
sym2img: $(LIBMAP_STATIC) sym2img.o mapserver.h |
| 41 |
- $(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img |
| 42 |
+ $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS) |
| 43 |
|
| 44 |
legend: $(LIBMAP_STATIC) legend.o mapserver.h |
| 45 |
- $(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend |
| 46 |
+ $(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS) |
| 47 |
|
| 48 |
scalebar: $(LIBMAP_STATIC) scalebar.o mapserver.h |
| 49 |
- $(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar |
| 50 |
+ $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS) |
| 51 |
|
| 52 |
mapserv: mapserv.h maptile.h $(LIBMAP_STATIC) mapserv.o cgiutil.o maptile.o mapserver.h |
| 53 |
- $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv |
| 54 |
+ $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS) |
| 55 |
|
| 56 |
shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h |
| 57 |
- $(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex |
| 58 |
+ $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS) |
| 59 |
|
| 60 |
shptree: $(LIBMAP_STATIC) shptree.o mapserver.h |
| 61 |
- $(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree |
| 62 |
+ $(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS) |
| 63 |
|
| 64 |
shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h |
| 65 |
- $(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis |
| 66 |
+ $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS) |
| 67 |
|
| 68 |
shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h |
| 69 |
- $(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst |
| 70 |
+ $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS) |
| 71 |
|
| 72 |
sortshp: $(LIBMAP_STATIC) sortshp.o mapserver.h |
| 73 |
- $(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp |
| 74 |
+ $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS) |
| 75 |
|
| 76 |
tile4ms: $(LIBMAP_STATIC) tile4ms.o mapserver.h |
| 77 |
- $(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms |
| 78 |
+ $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS) |
| 79 |
|
| 80 |
msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h |
| 81 |
- $(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt |
| 82 |
+ $(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS) |
| 83 |
|
| 84 |
testexpr: $(LIBMAP_STATIC) testexpr.o mapparser.o maplexer.o mapserver.h |
| 85 |
- $(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr |
| 86 |
+ $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS) |
| 87 |
|
| 88 |
testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h |
| 89 |
- $(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy |
| 90 |
+ $(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS) |
| 91 |
|
| 92 |
test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c mapserver.h |
| 93 |
- $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto |
| 94 |
+ $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS) |
| 95 |
|
| 96 |
mapscriptvars: Makefile |
| 97 |
touch mapscriptvars |
| 98 |
pwd > mapscriptvars |
| 99 |
echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars |
| 100 |
echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars |
| 101 |
- echo $(EXE_LDFLAGS) >> mapscriptvars |
| 102 |
+ echo $(LDFLAGS) >> mapscriptvars |
| 103 |
echo $(STATIC_LIBS) >> mapscriptvars |
| 104 |
grep '#define MS_VERSION ' mapserver.h >> mapscriptvars |
Archives