diff options
Diffstat (limited to 'sci-geosciences/mapserver/files/5.4.2-ldflags.patch')
| -rw-r--r-- | sci-geosciences/mapserver/files/5.4.2-ldflags.patch | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch b/sci-geosciences/mapserver/files/5.4.2-ldflags.patch deleted file mode 100644 index d202b8d4692f..000000000000 --- a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 56cb209..46a8a4c 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -252,7 +252,7 @@ SUP_LIBS = $(GD_LIB) $(AGG_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIBS) \ - # STATIC_LIBS is full filename with path of libs that will be statically linked - STATIC_LIBS= $(GD_STATIC) - --EXE_LDFLAGS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) -+EXE_LIBS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) - - RM= /bin/rm -f - -@@ -316,59 +316,59 @@ $(LIBMAP_SHARED): $(LIBMAP_STATIC) - && ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED) - - shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h -- $(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf -+ $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS) - - shp2img: $(LIBMAP_STATIC) shp2img.o mapserver.h -- $(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img -+ $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS) - - sym2img: $(LIBMAP_STATIC) sym2img.o mapserver.h -- $(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img -+ $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS) - - legend: $(LIBMAP_STATIC) legend.o mapserver.h -- $(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend -+ $(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS) - - scalebar: $(LIBMAP_STATIC) scalebar.o mapserver.h -- $(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar -+ $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS) - - mapserv: mapserv.h maptile.h $(LIBMAP_STATIC) mapserv.o cgiutil.o maptile.o mapserver.h -- $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv -+ $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS) - - shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h -- $(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex -+ $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS) - - shptree: $(LIBMAP_STATIC) shptree.o mapserver.h -- $(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree -+ $(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS) - - shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h -- $(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis -+ $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS) - - shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h -- $(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst -+ $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS) - - sortshp: sortshp.o -- $(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp -+ $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS) - - tile4ms: tile4ms.o -- $(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms -+ $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS) - - msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h -- $(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt -+ $(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS) - - testexpr: testexpr.o mapparser.o maplexer.o -- $(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr -+ $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS) - - testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h -- $(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy -+ $(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS) - - test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c -- $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto -+ $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS) - - mapscriptvars: Makefile - touch mapscriptvars - pwd > mapscriptvars - echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars - echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(TIFF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars -- echo $(EXE_LDFLAGS) >> mapscriptvars -+ echo $(LDFLAGS) >> mapscriptvars - echo $(STATIC_LIBS) >> mapscriptvars - grep '#define MS_VERSION ' mapserver.h >> mapscriptvars - |