[Pkg-voip-commits] r4941 - in /opal/trunk/debian: changelog rules
kilian at alioth.debian.org
kilian at alioth.debian.org
Fri Nov 30 22:13:10 UTC 2007
Author: kilian
Date: Fri Nov 30 22:13:10 2007
New Revision: 4941
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4941
Log:
* Drop notrace build entirely to fixup ABI issues (Closes: #447452)
Modified:
opal/trunk/debian/changelog
opal/trunk/debian/rules
Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=4941&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Fri Nov 30 22:13:10 2007
@@ -1,6 +1,7 @@
opal (2.2.11~dfsg1-4) UNRELEASED; urgency=low
* Fix regexp generating UPVRESION for backports.
+ * Drop notrace build entirely to fixup ABI issues (Closes: #447452)
-- Kilian Krause <kilian at debian.org> Sat, 3 Nov 2007 11:16:00 +0100
Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=4941&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Fri Nov 30 22:13:10 2007
@@ -6,7 +6,7 @@
PACKAGE=libopal-$(LIBOPALCOMPAT)
-# excludes for the -ptrace and -develop version
+# excludes for the -develop version
STRIP_EXCLUDES = -N$(PACKAGE) -Nlibopal-dbg -Nlibopal-dev -Nsimpleopal
ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION version.h))
@@ -69,9 +69,6 @@
touch $@
build-arch-stamp: config.status
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace optshared
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace optnoshared
-
# put NOTRACE to empty to build with PTRACING code
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt optshared
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt optnoshared
@@ -82,19 +79,16 @@
# ...first static
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
$(RM) -rf samples/simple/obj_*
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace -C samples/simple optnoshared
# put NOTRACE to empty to build with PTRACING code
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optnoshared
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug -C samples/simple debugnoshared
- samples/simple/obj_*_n/simpleopal --help >/dev/null
samples/simple/obj_*_r/simpleopal --help >/dev/null
samples/simple/obj_*_d/simpleopal --help >/dev/null
## then shared...
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
$(RM) -rf samples/simple/obj_*
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace -C samples/simple optshared
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optshared
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug -C samples/simple debugshared
if (samples/simple/obj_*_d/simpleopal --help >/dev/null);then \
@@ -109,12 +103,6 @@
echo shared opt simpleopal correctly compiled non-static; \
fi
LD_LIBRARY_PATH=$(CURDIR)/lib/opt samples/simple/obj_*_r/simpleopal --help >/dev/null
- if (samples/simple/obj_*_n/simpleopal --help >/dev/null);then \
- echo shared notrace simpleopal incorrectly compiled static; false;\
- else \
- echo shared notrace simpleopal correctly compiled non-static; \
- fi
- LD_LIBRARY_PATH=$(CURDIR)/lib/notrace samples/simple/obj_*_n/simpleopal --help >/dev/null
#$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
#$(RM) -rf samples/simple/obj_*
@@ -162,44 +150,39 @@
dh_clean -k -a
dh_installdirs -a
install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib \
- $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib \
$(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
- install -m 755 lib/notrace/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
- install -m 755 lib/opt/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib
+ install -m 755 lib/opt/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
install -m 755 lib/debug/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
- #$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
- #$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt DESTDIR=$(CURDIR)/debian/$(PACKAGE)-ptrace -C plugins install
+ #$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
#$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug DESTDIR=$(CURDIR)/debian/$(PACKAGE)-develop -C plugins install
- #for suffix in "" "-ptrace" "-develop";do \
+ #for suffix in "" "-develop";do \
# mv $(CURDIR)/debian/$(PACKAGE)$$suffix/usr/lib/pwlib $(CURDIR)/debian/$(PACKAGE)$$suffix/usr/lib/opal-$(SHLIBSVER) ;\
# mv $(CURDIR)/debian/$(PACKAGE)$$suffix/usr/lib/opal-$(SHLIBSVER) $(CURDIR)/debian/$(PACKAGE)$$suffix/usr/lib/pwlib/opal-$(SHLIBSVER) ;\
#done
ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT))
- for suffix in "" "-ptrace" "-develop";do \
+ for suffix in "" "-develop";do \
ln -s libopal.so.$(SHLIBSVER) \
debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT); \
done
endif
ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT2))
- for suffix in "" "-ptrace" "-develop";do \
+ for suffix in "" "-develop";do \
ln -s libopal.so.$(SHLIBSVER) \
debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT2); \
done
endif
# simpleopal
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/notrace INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
# clean simple to install it as a sample in the docs
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
$(RM) -rf samples/simple/obj_*
# libopal-dev package
- cp -v lib/notrace/libopal_s.a debian/libopal-dev/usr/lib/
- cp -v lib/opt/libopal_s.a debian/libopal-dev/usr/lib/libopal_r_s.a
+ cp -v lib/opt/libopal_s.a debian/libopal-dev/usr/lib/
cp -v lib/debug/libopal_s.a debian/libopal-dev/usr/lib/libopal_d_s.a
ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so
- ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so.$(VER_MAJOR)
sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
opal_inc.mak > debian/libopal-dev/usr/share/opal/opal_inc.mak
@@ -217,7 +200,6 @@
# binary-arch/binary-multi
# in another 'make' thread.
binary-common:
-
dh_testdir
dh_testroot
dh_installdocs
@@ -233,7 +215,7 @@
dh_compress
dh_fixperms
# a new variable will be needed if an epoch is introduced to our versioning
- dh_makeshlibs -V '$(PACKAGE) (>= $(UPVERSION)~) | $(PACKAGE)-ptrace (>= $(UPVERSION)~) | $(PACKAGE)-develop (>= $(UPVERSION)~)'
+ dh_makeshlibs -V '$(PACKAGE) (>= $(UPVERSION)~) | $(PACKAGE)-develop (>= $(UPVERSION)~)'
dh_installdeb
dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
@@ -245,10 +227,9 @@
dh_testdir
dh_testroot
ifneq (4,$(DH_COMPAT))
- dh_strip -Nlibopal-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=libopal-dbg
+ dh_strip -Nlibopal-dbg -N$(PACKAGE)-develop --dbg-package=libopal-dbg
# can't ship those in libopal-dbg due to namespace overlap
- dh_strip -p$(PACKAGE)-ptrace $(STRIP_EXCLUDES) -N$(PACKAGE)-develop --dbg-package=$(PACKAGE)-ptrace
- dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) -N$(PACKAGE)-ptrace --dbg-package=$(PACKAGE)-develop
+ dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) --dbg-package=$(PACKAGE)-develop
else
# As dh_strip does not work fine for multiple binary package
# we need to workaround that manually
@@ -257,10 +238,6 @@
for pack in $(PACKAGE) simpleopal ; do \
cp -af debian/$$pack/usr/lib/debug debian/libopal-dbg/usr/lib && \
rm -rf debian/$$pack/usr/lib/debug; \
- done
- for pack in -ptrace -develop;do \
- cp -af debian/$(PACKAGE)$$pack/usr/lib/debug debian/libopal-dbg$$pack/usr/lib && \
- rm -rf debian/$(PACKAGE)$$pack/usr/lib/debug; \
done
endif
More information about the Pkg-voip-commits
mailing list