[Git][debian-gis-team/pysolid][master] 2 commits: New 0001-Fix-build-flags.patch

[Antonio Valentino (@antonio.valentino)]

Antonio Valentino pushed to branch master at Debian GIS Project / pysolid


Commits:
43dd93dc by Antonio Valentino at 2024-07-01T06:15:05+00:00
New 0001-Fix-build-flags.patch

- - - - -
6803a875 by Antonio Valentino at 2024-07-01T06:16:09+00:00
Clean d/rules

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/0001-Fix-build-flags.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -6,6 +6,8 @@ pysolid (0.3.3-1) unstable; urgency=medium
       python3-scikit-build-core.
   * Update dates in d/copyright.
   * Update lintian overrides.
+  * debian/patches:
+    - New 0001-Fix-build-flags.patch.
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 30 Jun 2024 08:26:08 +0000
 


=====================================
debian/patches/0001-Fix-build-flags.patch
=====================================
@@ -0,0 +1,28 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sun, 30 Jun 2024 15:19:14 +0000
+Subject: Fix build flags
+
+Forwarded: not-needed
+---
+ CMakeLists.txt | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 380a41f..2911548 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,14 @@
+ cmake_minimum_required(VERSION 3.17.2...3.29)
+ project(${SKBUILD_PROJECT_NAME} LANGUAGES C Fortran)
+ 
++set(CMAKE_C_FLAGS "$ENV{CPPFLAGS} $ENV{CFLAGS} ${CMAKE_C_FLAGS}")
++set(CMAKE_CXX_FLAGS "$ENV{CPPFLAGS} $ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS}")
++set(CMAKE_Fortran_FLAGS "$ENV{CPPFLAGS} $ENV{FFLAGS} ${CMAKE_Fortran_FLAGS}")
++
++message(STATUS "CMAKE_C_FLAGS:   ${CMAKE_C_FLAGS}")
++message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
++message(STATUS "CMAKE_Fortran_FLAGS: ${CMAKE_Fortran_FLAGS}")
++
+ find_package(
+   Python
+   COMPONENTS Interpreter Development.Module NumPy


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Fix-build-flags.patch


=====================================
debian/rules
=====================================
@@ -1,6 +1,8 @@
 #! /usr/bin/make -f
 
-export DH_VERBOSE=1
+# export DH_VERBOSE=1
+export SKBUILD_CMAKE_ARGS=-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+
 export MPLBACKEND=Agg
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all buildinfo=+path
 export PYBUILD_NAME=pysolid
@@ -9,12 +11,5 @@ export PYBUILD_TEST_ARGS=\
  env PYTHONPATH={build_dir} xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' python{version} $(CURDIR)/tests/grid.py &&\
  env PYTHONPATH={build_dir} xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' python{version} $(CURDIR)/tests/point.py
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-CFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=$(CPPFLAGS)
-FFLAGS+=$(CPPFLAGS)
-CFLAGS+=$(LDFLAGS)
-
 %:
 	dh $@ --buildsystem=pybuild



View it on GitLab: https://salsa.debian.org/debian-gis-team/pysolid/-/compare/7284f5438e03665086cf7e5e6c7c45dc4ee4dea5...6803a875c7869ea0becf86f85bc6c1d16cf1f500

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/pysolid/-/compare/7284f5438e03665086cf7e5e6c7c45dc4ee4dea5...6803a875c7869ea0becf86f85bc6c1d16cf1f500
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240701/76c2c30d/attachment-0001.htm>