[med-svn] [Git][med-team/cdbfasta][master] 3 commits: Fix non cross-building

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / cdbfasta


Commits:
1590b86a by Nilesh Patra at 2021-01-18T23:46:51+05:30
Fix non cross-building

- - - - -
c3eb05f2 by Nilesh Patra at 2021-01-18T23:48:27+05:30
Declare compliance with policy 4.5.1

- - - - -
ca6f929d by Nilesh Patra at 2021-01-18T23:49:29+05:30
Update changelog

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/cross.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+cdbfasta (1.00+git20181005.014498c+dfsg-2) unstable; urgency=medium
+
+  [ Helmut Grohne]
+  * Team upload.
+  * Improve cross building: (Closes: #980128)
+    + cross.patch: Make pkg-config substitutable.
+    + d/rules: Pass a triplet-prefixed g++.
+
+  [ Nilesh Patra ]
+  * Declare compliance with policy 4.5.1
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 14 Jan 2021 20:32:35 +0100
+
 cdbfasta (1.00+git20181005.014498c+dfsg-1) unstable; urgency=medium
 
   * Point homepage to Github


=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 13),
                pkg-config,
                libgclib-dev,
                help2man
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/cdbfasta
 Vcs-Git: https://salsa.debian.org/med-team/cdbfasta.git
 Homepage: https://github.com/gpertea/cdbfasta


=====================================
debian/patches/cross.patch
=====================================
@@ -0,0 +1,19 @@
+--- cdbfasta-1.00+git20181005.014498c+dfsg.orig/Makefile
++++ cdbfasta-1.00+git20181005.014498c+dfsg/Makefile
+@@ -1,5 +1,6 @@
+ GCLDIR := ./gclib
+-SEARCHDIRS := `pkg-config --cflags libgclib`
++PKG_CONFIG ?= pkg-config
++SEARCHDIRS := `$(PKG_CONFIG) --cflags libgclib`
+ CC      := g++
+ 
+ BASEFLAGS  = -Wall ${SEARCHDIRS} $(MARCH) -DENABLE_COMPRESSION=1 -D_FILE_OFFSET_BITS=64 \
+@@ -42,7 +43,7 @@
+ #LDFLAGS = 
+ #uncomment this when ENABLE_COMPRESSION
+ LDFLAGS  := -lz $(LDFLAGS)
+-LIBS      = `pkg-config --libs libgclib`
++LIBS      = `$(PKG_CONFIG) --libs libgclib`
+ 
+ .PHONY : all
+ all:    cdbfasta cdbyank 


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 workaround-lintian-false-positive
 hardening.patch
 use_debian_packaged_gclib.patch
+cross.patch


=====================================
debian/rules
=====================================
@@ -7,12 +7,13 @@
 #export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/dpkg/buildtools.mk
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	dh_auto_build -- LINKER="g++ $(LDFLAGS)"
+	dh_auto_build -- LINKER="$(CXX) $(LDFLAGS)"
 
 override_dh_installman:
 	help2man --no-info --no-discard-stderr --version-option=-v ./cdbfasta |\



View it on GitLab: https://salsa.debian.org/med-team/cdbfasta/-/compare/009b65368fa99e05bffc2abaef1aa88c0e870702...ca6f929df6614b61b6259ac84fde31349fbd73ec

-- 
View it on GitLab: https://salsa.debian.org/med-team/cdbfasta/-/compare/009b65368fa99e05bffc2abaef1aa88c0e870702...ca6f929df6614b61b6259ac84fde31349fbd73ec
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/debian-med-commit/attachments/20210118/59b90e86/attachment-0001.html>