[med-svn] [Git][med-team/libzeep][master] 2 commits: finally at the right location
Maarten L. Hekkelman
gitlab at salsa.debian.org
Wed Sep 9 17:44:54 BST 2020
Maarten L. Hekkelman pushed to branch master at Debian Med / libzeep
Commits:
2ee403a1 by Maarten L. Hekkelman at 2020-09-09T17:21:23+02:00
finally at the right location
- - - - -
65687ffd by Maarten L. Hekkelman at 2020-09-09T17:24:25+02:00
clean up patches
- - - - -
6 changed files:
- − debian/patches/hurd-patch
- debian/patches/install-targets
- − debian/patches/jamfile-patch
- − debian/patches/makefile.diff
- − debian/patches/nostrip.diff
- debian/rules
Changes:
=====================================
debian/patches/hurd-patch deleted
=====================================
@@ -1,21 +0,0 @@
-Description: assorted fixes
- [Maarten L. Hekkelman <m.hekkelman at cmbi.ru.nl>]
- * Fixed compilation failure by only adding the WCONTINUED
- flag if it is defined.
- .
- Upstream is aware of this patch.
-Author: Maarten L. Hekkelman <m.hekkelman at cmbi.ru.nl>
---- a/lib-http/src/preforked-server.cpp
-+++ b/lib-http/src/preforked-server.cpp
-@@ -23,6 +23,11 @@
-
- #include <sys/wait.h>
-
-+// for Hurd
-+#if not defined(WCONTINUED)
-+#define WCONTINUED 0
-+#endif
-+
- using namespace std;
-
- namespace zeep { namespace http {
=====================================
debian/patches/install-targets
=====================================
@@ -5,11 +5,11 @@
LIBS = @LIBS@
-prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
++prefix = $(DESTDIR)/@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
-+docdir = $(DESTDIR)/share/doc/libzeep-doc
++docdir = @docdir@
BOOST_LIBS = program_options
ZEEP_LIBS = http json xml
@@ -52,7 +52,7 @@
LIBS = @LIBS@
-prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
++prefix = $(DESTDIR)/@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
@@ -68,7 +68,7 @@
$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
+
+.PHONY: install-dev
-+install: lib
++install-dev:
for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
@@ -85,7 +85,7 @@
LIBS = @LIBS@
-prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
++prefix = $(DESTDIR)/@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
@@ -101,7 +101,7 @@
$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
+
+.PHONY: install-dev
-+install: lib
++install-dev:
for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
@@ -118,7 +118,7 @@
LIBS = @LIBS@
-prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
++prefix = $(DESTDIR)/@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
@@ -134,7 +134,7 @@
$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
+
+.PHONY: install-dev
-+install: lib
++install-dev:
for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
=====================================
debian/patches/jamfile-patch deleted
=====================================
@@ -1,14 +0,0 @@
-Description: added path to quickbook
-Author: Maarten L. Hekkelman <maarten at hekkelman.com>
---- a/doc/Jamfile.v2
-+++ b/doc/Jamfile.v2
-@@ -4,7 +4,8 @@
- : /usr/share/xml/docbook/schema/dtd/4.2
- ;
- using doxygen ;
--using quickbook ;
-+using quickbook
-+ : /usr/bin/quickbook ;
-
- doxygen autodoc
- :
=====================================
debian/patches/makefile.diff deleted
=====================================
@@ -1,133 +0,0 @@
-Description: assorted fixes
- [Maarten L. Hekkelman <m.hekkelman at cmbi.ru.nl>]
- * Debianize the makefile, importing all the right flags.
- .
- Upstream is aware of this patch.
-Author: Maarten L. Hekkelman <m.hekkelman at cmbi.ru.nl>
---- a/makefile
-+++ b/makefile
-@@ -8,20 +8,18 @@
- # You may have to edit the first three defines on top of this
- # makefile to match your current installation.
-
--#BOOST_LIB_SUFFIX = # e.g. '-mt'
--#BOOST = $(HOME)/projects/boost
--BOOST_LIB_DIR = $(BOOST:%=%/lib)
--BOOST_INC_DIR = $(BOOST:%=%/include)
--
--PREFIX ?= /usr/local
--LIBDIR ?= $(PREFIX)/lib
--INCDIR ?= $(PREFIX)/include
--MANDIR ?= $(PREFIX)/man/man3
--DOCDIR ?= $(PREFIX)/share/doc/libzeep-doc
-+LIBDIR = $(DESTDIR)/usr/lib
-+INCDIR = $(DESTDIR)/usr/include
-+MANDIR = $(DESTDIR)/usr/share/man/man3
-+DOCDIR = $(DESTDIR)/usr/share/doc/libzeep-dev
-+
-+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-+CXXFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
-+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-
--BOOST_LIBS = system thread filesystem regex math_c99 random
-+BOOST_LIBS = system thread filesystem regex random
- BOOST_LIBS := $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX))
--LIBS = $(BOOST_LIBS) stdc++ m pthread rt
-+LIBS = $(BOOST_LIBS) stdc++ m pthread
- LDFLAGS += $(BOOST_LIB_DIR:%=-L%) $(LIBS:%=-l%) -g
-
- VERSION_MAJOR = 3.0
-@@ -32,13 +30,9 @@
- LIB_NAME = $(SO_NAME).$(VERSION_MINOR)
-
- CXX ?= c++
--#CFLAGS += -O2 $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -std=c++11 -stdlib=libc++
--CFLAGS += -O2 $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -std=c++11
--#CFLAGS += -g $(BOOST_INC_DIR:%=-I%) -I. -fPIC -pthread -shared # -std=c++0x
--CFLAGS += -Wall
--CFLAGS += -g
-+CXXFLAGS += -O2 -I. -fPIC -pthread -shared -std=c++0x
-+CXXFLAGS += -Wall
- LD ?= ld
--LD_CONFIG ?= ldconfig
-
- VPATH += src
-
-@@ -63,7 +57,7 @@
- obj/xpath.o \
- obj/writer.o
-
--lib: libzeep.a # libzeep.so
-+lib: libzeep.so
-
- libzeep.a: $(OBJECTS)
- ar rc $@ $(OBJECTS)
-@@ -86,30 +80,27 @@
- install-libs: libzeep.so
- install -d $(LIBDIR)
- install $(LIB_NAME) $(LIBDIR)/$(LIB_NAME)
-- strip --strip-unneeded $(LIBDIR)/$(LIB_NAME)
- ln -Tfs $(LIB_NAME) $(LIBDIR)/$(SO_NAME)
-- ln -Tfs $(LIB_NAME) $(LIBDIR)/libzeep.so
-- $(LD_CONFIG) -n $(LIBDIR)
-+ strip --strip-unneeded $(LIBDIR)/$(LIB_NAME)
-
--install-dev: libzeep.a
-- install -d $(LIBDIR) $(INCDIR)/zeep/xml $(INCDIR)/zeep/http $(INCDIR)/zeep/http/webapp
-+install-dev: doc libzeep.a
-+ install -d $(MANDIR) $(LIBDIR) $(INCDIR)/zeep/xml $(INCDIR)/zeep/http $(INCDIR)/zeep/http/webapp
- for f in `find zeep -name "*.hpp"`; do install $$f $(INCDIR)/$$f; done
-- install ./libzeep.a $(LIBDIR)/libzeep.a
-- strip -SX $(LIBDIR)/libzeep.a
--
--install-doc: doc
-- install -d $(MANDIR) $(DOCDIR)/html
- install doc/libzeep.3 $(MANDIR)/libzeep.3
-- cd doc; for d in `find html -type d`; do install -d $(DOCDIR)/$$d; done
-- cd doc; for f in `find html -type f`; do install $$f $(DOCDIR)/$$f; done
-+ install -d $(DOCDIR)
-+ cd doc/html; for d in `find . -type d`; do install -d $(DOCDIR)/$$d; done
-+ cd doc/html; for f in `find . -type f`; do install $$f $(DOCDIR)/$$f; done
-+ ln -Tfs $(LIB_NAME) $(LIBDIR)/libzeep.so
-
--install: install-libs install-dev install-doc
-+install: install-libs install-dev
-
--dist: doc
-+dist: lib doc
- rm -rf $(DIST_NAME)
- mkdir -p $(DIST_NAME)
- git archive master | tar xC $(DIST_NAME)
-- find doc/html -depth | cpio -pd $(DIST_NAME)
-+
-+ find doc/html -depth | cpio -pvd $(DIST_NAME)
-+
- rm -rf $(DIST_NAME)/tests
- tar czf $(DIST_NAME).tgz $(DIST_NAME)
- rm -rf $(DIST_NAME)
-@@ -118,22 +109,18 @@
- cd doc; bjam
-
- obj/%.o: %.cpp | obj
-- $(CXX) -MD -c -o $@ $< $(CFLAGS)
-+ $(CXX) -MD -c -o $@ $< $(CXXFLAGS)
-
- obj:
- mkdir -p obj
-
--include $(OBJECTS:%.o=%.d)
-+-include $(OBJECTS:%.o=%.d)
-
- $(OBJECTS:.o=.d):
-
--test: libzeep.a
-- make -C tests
--
- clean:
- rm -rf obj/* libzeep.a libzeep.so* zeep-test $(DIST_NAME) $(DIST_NAME).tgz
- cd doc; bjam clean
-- rm -rf doc/bin doc/html
-- $(MAKE) -C tests clean
-+ rm -rf doc/bin
-
- FORCE:
=====================================
debian/patches/nostrip.diff deleted
=====================================
@@ -1,15 +0,0 @@
-From: Helmut Grohne <helmut at subdivi.de>
-Date: Mon, 20 May 2019 17:42:30 +0200
-Bug-Debian: https://bugs.debian.org/929274
-Description: pass cross tools to make
-
---- a/makefile
-+++ b/makefile
-@@ -81,7 +81,6 @@ install-libs: libzeep.so
- install -d $(LIBDIR)
- install $(LIB_NAME) $(LIBDIR)/$(LIB_NAME)
- ln -Tfs $(LIB_NAME) $(LIBDIR)/$(SO_NAME)
-- strip --strip-unneeded $(LIBDIR)/$(LIB_NAME)
-
- install-dev: doc libzeep.a
- install -d $(MANDIR) $(LIBDIR) $(INCDIR)/zeep/xml $(INCDIR)/zeep/http $(INCDIR)/zeep/http/webapp
=====================================
debian/rules
=====================================
@@ -8,7 +8,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
dh $@
override_dh_auto_configure:
- dh_auto_configure -- --enable-documentation --prefix=$(DESTDIR)
+ dh_auto_configure -- --enable-documentation
override_dh_auto_install:
$(MAKE) DESTDIR=$(CURDIR)/debian/libzeep5.0 install-libs
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/compare/d2f8c05f7244775672a79bbb5e28332726efdd68...65687ffdf57ea86beffc492d4c183f3da34b37b9
--
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/compare/d2f8c05f7244775672a79bbb5e28332726efdd68...65687ffdf57ea86beffc492d4c183f3da34b37b9
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/20200909/4acbedf9/attachment-0001.html>
More information about the debian-med-commit
mailing list