Angelos Tzotsos pushed to branch master at Debian GIS Project / zoo-project
Commits:
f87156a3 by Angelos Tzotsos at 2022-08-02T15:36:26+03:00
Update cflags patch
- - - - -
2 changed files:
- debian/patches/patch_cflags.patch
- debian/rules
Changes:
=====================================
debian/patches/patch_cflags.patch
=====================================
@@ -22,7 +22,7 @@ Last-Update: 2022-08-02
MONO_FILE=@MONO_FILE@
-CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H @CALLBACK_USE@ @SSH2_CPPFLAGS@
@PROJ_CPPFLAGS@ @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@
${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS}
-I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
-+CFLAGS=-DPROJ_VERSION_MAJOR @CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@
@RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS}
${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I.
-DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
++CFLAGS=-DPROJ_VERSION_MAJOR=8 @CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@
@RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS}
${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I.
-DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
LDFLAGS=-lzoo_service @SSH2_LDFLAGS@ @PROJ_LDFLAGS@ @DEFAULT_LIBS@
-L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS}
${PERLLDFLAGS} ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} ${FCGI_LDFLAGS}
@OPENSSL_LDFLAGS@ @UUID_LDFLAGS@ ${MS_LDFLAGS} ${MACOS_LD_FLAGS}
${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS}
${MONO_LDFLAGS} ${RLDFLAGS} @JSON_LDFLAGS@ @XSLT_LDFLAGS@
DATAROOTDIR=@datarootdir@/zoo-project
=====================================
debian/rules
=====================================
@@ -3,7 +3,6 @@
# Enable hardening build flags
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-export DEB_CPPFLAGS_MAINT_APPEND=-DPROJ_VERSION_MAJOR=$(shell dpkg-query -W
-f='$${Version}' libproj-dev | awk -F. '{ print $$1 }')
# Disable PIE on Ubuntu where it's still problematic
VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu &&
echo yes)
View it on GitLab:
https://salsa.debian.org/debian-gis-team/zoo-project/-/commit/f87156a32fb2943282cdf3af3adaf90f0dc25cf9
--
View it on GitLab:
https://salsa.debian.org/debian-gis-team/zoo-project/-/commit/f87156a32fb2943282cdf3af3adaf90f0dc25cf9
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
