mirror of
https://git.osgeo.org/gitea/postgis/postgis
synced 2024-10-24 09:02:37 +00:00
#3308 patch winnie's build and packaging and regress to go back to static linking.
git-svn-id: http://svn.osgeo.org/postgis/trunk@14174 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
parent
6d6100a79e
commit
c83b12ab53
|
@ -139,5 +139,10 @@ fi;
|
|||
if [ "$POSTGIS_MINOR_VERSION" == "0" ] ; then
|
||||
cp ${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/include/json/json_object.h.for_compile ${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/include/json/json_object.h
|
||||
fi;
|
||||
|
||||
|
||||
#patch liblwgeom generated make to get rid of dynamic linking
|
||||
sed -i 's/LDFLAGS += -no-undefined//g' liblwgeom/Makefile
|
||||
|
||||
make && make install
|
||||
|
||||
|
|
|
@ -149,8 +149,8 @@ if [ -n "$SFCGAL_VER" ]; then
|
|||
|
||||
cp -p ${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
|
||||
cp -p ${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin
|
||||
cp -p ${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
|
||||
cp -p ${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin/postgisgui
|
||||
# cp -p ${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
|
||||
# cp -p ${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin/postgisgui
|
||||
fi;
|
||||
#cp ${MINGPROJECTS}/libxml/rel-libxml2-2.7.8w${OS_BUILD}/bin/*.dll $outdir/bin/
|
||||
cp ${PGPATHEDB}/bin/libxml2-2.dll $outdir/bin/
|
||||
|
@ -177,7 +177,7 @@ cp liblwgeom/.libs/*.dll ${RELDIR}/${RELVERDIR}/bin
|
|||
cp loader/.libs/shp2pgsql.exe ${RELDIR}/${RELVERDIR}/bin
|
||||
cp loader/.libs/pgsql2shp.exe ${RELDIR}/${RELVERDIR}/bin
|
||||
cp loader/.libs/shp2pgsql-gui.exe ${RELDIR}/${RELVERDIR}/bin/postgisgui
|
||||
cp liblwgeom/.libs/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui
|
||||
#cp liblwgeom/.libs/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui
|
||||
|
||||
#shp2pgsql-gui now has dependency on geos (though in theory it shouldn't)
|
||||
cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui
|
||||
|
|
|
@ -134,6 +134,10 @@ make clean
|
|||
if [ "$POSTGIS_MINOR_VERSION" == "0" ] ; then
|
||||
cp ${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/include/json/json_object.h.for_compile ${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/include/json/json_object.h
|
||||
fi;
|
||||
|
||||
#patch liblwgeom generated make to get rid of dynamic linking
|
||||
sed -i 's/LDFLAGS += -no-undefined//g' liblwgeom/Makefile
|
||||
|
||||
make
|
||||
make install
|
||||
make check RUNTESTFLAGS=-v
|
||||
|
|
Loading…
Reference in a new issue