[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2307: turn on dynchk builds

Mats Wichmann mats at linuxfoundation.org
Tue Sep 25 16:45:12 UTC 2012


------------------------------------------------------------
revno: 2307
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Tue 2012-09-25 10:45:12 -0600
message:
  turn on dynchk builds
modified:
  appchk/makefile
  archk/makefile
  cmdchk/makefile
  dynchk/misc/lsb_output.c
  libchk/makefile
  makefile
  package/Makefile
  package/lsb-check.spec.sed
  pkgchk/makefile
-------------- next part --------------
=== modified file 'appchk/makefile'
--- a/appchk/makefile	2008-05-12 19:58:34 +0000
+++ b/appchk/makefile	2012-09-25 16:45:12 +0000
@@ -20,10 +20,10 @@
 	/opt/lsb/bin/lsbcc $(CFLAGS) --lsb-use-default-linker -o appchk appchk.c $(OBJS) $(LIBS)
 
 install:
-	install -d $(INSTALL_ROOT)/$(BINDIR)
-	install appchk $(INSTALL_ROOT)/$(BINDIR)/lsbappchk
-	install -d $(INSTALL_ROOT)/$(MANDIR)/man1
-	install lsbappchk.1 $(INSTALL_ROOT)/$(MANDIR)/man1/lsbappchk.1
+	install -d $(DESTDIR)$(INSTALL_ROOT)/$(BINDIR)
+	install appchk $(DESTDIR)$(INSTALL_ROOT)/$(BINDIR)/lsbappchk
+	install -d $(DESTDIR)$(INSTALL_ROOT)/$(MANDIR)/man1
+	install lsbappchk.1 $(DESTDIR)$(INSTALL_ROOT)/$(MANDIR)/man1/lsbappchk.1
 
 test: appchk
 	./test_appchk

=== modified file 'archk/makefile'
--- a/archk/makefile	2007-10-19 11:25:01 +0000
+++ b/archk/makefile	2012-09-25 16:45:12 +0000
@@ -12,10 +12,10 @@
 	$(CC) $(CFLAGS) -o archk $(OBJS) $(LIBS)
 
 install:
-	install -d $(INSTALL_ROOT)/$(BINDIR)
-	install archk $(INSTALL_ROOT)/$(BINDIR)/lsbarchk
-	install -d $(INSTALL_ROOT)/$(MANDIR)/man1
-	install lsbarchk.1 $(INSTALL_ROOT)/$(MANDIR)/man1/lsbarchk.1
+	install -d $(DESTDIR)$(INSTALL_ROOT)/$(BINDIR)
+	install archk $(DESTDIR)$(INSTALL_ROOT)/$(BINDIR)/lsbarchk
+	install -d $(DESTDIR)$(INSTALL_ROOT)/$(MANDIR)/man1
+	install lsbarchk.1 $(DESTDIR)$(INSTALL_ROOT)/$(MANDIR)/man1/lsbarchk.1
 
 test: archk
 	./test_archk

=== modified file 'cmdchk/makefile'
--- a/cmdchk/makefile	2011-03-27 22:21:45 +0000
+++ b/cmdchk/makefile	2012-09-25 16:45:12 +0000
@@ -34,10 +34,10 @@
 	chmod +x cmdchk.py
 
 install:
-	install -d $(INSTALL_ROOT)/$(BINDIR)
-	install cmdchk $(INSTALL_ROOT)$(BINDIR)/lsbcmdchk
-	install -d $(INSTALL_ROOT)/$(MANDIR)/man1
-	install lsbcmdchk.1 $(INSTALL_ROOT)/$(MANDIR)/man1/lsbcmdchk.1
+	install -d $(DESTDIR)$(INSTALL_ROOT)/$(BINDIR)
+	install cmdchk $(DESTDIR)$(INSTALL_ROOT)$(BINDIR)/lsbcmdchk
+	install -d $(DESTDIR)$(INSTALL_ROOT)/$(MANDIR)/man1
+	install lsbcmdchk.1 $(DESTDIR)$(INSTALL_ROOT)/$(MANDIR)/man1/lsbcmdchk.1
 
 test:
 

=== modified file 'dynchk/misc/lsb_output.c'
--- a/dynchk/misc/lsb_output.c	2012-06-26 07:14:59 +0000
+++ b/dynchk/misc/lsb_output.c	2012-09-25 16:45:12 +0000
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
+#include <execinfo.h>
 
 #include "../tests/type_tests.h"                                                                                                                          
 #include "../misc/lsb_output.h"

=== modified file 'libchk/makefile'
--- a/libchk/makefile	2012-02-18 12:18:28 +0000
+++ b/libchk/makefile	2012-09-25 16:45:12 +0000
@@ -46,10 +46,10 @@
 	$(CC) $(CFLAGS) -fno-builtin-acos -c -o $@ dummy_link.c
 
 install:
-	install -d $(INSTALL_ROOT)/$(BINDIR)
-	install libchk lsblibchk dummy_link $(INSTALL_ROOT)/$(BINDIR)/
-	install -d $(INSTALL_ROOT)/$(MANDIR)/man1/
-	install lsblibchk.1 $(INSTALL_ROOT)/$(MANDIR)/man1/lsblibchk.1
+	install -d $(DESTDIR)$(INSTALL_ROOT)/$(BINDIR)
+	install libchk lsblibchk dummy_link $(DESTDIR)$(INSTALL_ROOT)/$(BINDIR)/
+	install -d $(DESTDIR)$(INSTALL_ROOT)/$(MANDIR)/man1/
+	install lsblibchk.1 $(DESTDIR)$(INSTALL_ROOT)/$(MANDIR)/man1/lsblibchk.1
 
 test: libchk dummy_link
 	./test_libchk

=== modified file 'makefile'
--- a/makefile	2011-03-27 22:21:45 +0000
+++ b/makefile	2012-09-25 16:45:12 +0000
@@ -1,8 +1,12 @@
 export BINDIR=/bin
 export MANDIR=/man
+export INSTALL_ROOT=/usr/local
+export INCLUDEDIR=/include
+export LIB64=$(shell case `uname -m` in (ppc64|s390x|x86_64) echo 64 ;; esac)
+export LIBDIR=/lib$(LIB64)
 
-SUBDIRS=tetj fhschk elfchk rpmchk appchk libchk cmdchk pkgchk archk
-RELEASEDIRS=libchk appchk cmdchk pkgchk
+SUBDIRS=tetj fhschk elfchk rpmchk appchk libchk cmdchk pkgchk archk dynchk
+RELEASEDIRS=libchk appchk cmdchk pkgchk dynchk
 
 all:
 	for d in $(SUBDIRS);do (cd $$d && $(MAKE) all LSBVERSION=$$LSBVERSION);done

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-09-12 14:13:00 +0000
+++ b/package/Makefile	2012-09-25 16:45:12 +0000
@@ -9,7 +9,7 @@
 
 # Supply default LSBVERSION - target spec version.
 # a big second number (80-99) is leading up to next major spec
-LSBVERSION=4.83
+LSBVERSION=4.84
 # Get value of RPM_PACKAGE_VERSION from LSBVERSION.
 RPM_PACKAGE_VERSION=$(LSBVERSION)
 
@@ -20,7 +20,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=4
+RPM_PACKAGE_RELEASE=1
 
 # Derive date string for daily snapshots
 ISO_DATE:=$(shell date +"%Y%m%d")
@@ -137,6 +137,7 @@
 	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_APP) .
 	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_CMD) .
 	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_PKG) .
+	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_DYN) .
 	@cp $(RPM_SRPM_DIR)/$(RPM_SOURCE_NAME) .
 	@rm -rf $(RPM_TMP_BUILD_DIR)
 
@@ -146,10 +147,11 @@
 	@fakeroot alien -dck $(RPM_BINARY_APP)
 	@fakeroot alien -dck $(RPM_BINARY_CMD)
 	@fakeroot alien -dck $(RPM_BINARY_PKG)
+	@fakeroot alien -dck $(RPM_BINARY_DYN)
 
 # List files that should be uploaded to ftp server for snapshots
 list_uploadable:
-	@echo $(RPM_BINARY_LIB) $(RPM_BINARY_APP) $(RPM_BINARY_CMD) $(RPM_BINARY_PKG)
+	@echo $(RPM_BINARY_LIB) $(RPM_BINARY_APP) $(RPM_BINARY_CMD) $(RPM_BINARY_PKG) $(RPM_BINARY_DYN)
 ifdef LIST_SOURCE_FILES
 	@echo $(RPM_SOURCE_NAME) $(TARBALL) 
 endif
@@ -167,6 +169,7 @@
 	rm -f $(FULL_PACKAGE_NAME_APP).rpm
 	rm -f $(FULL_PACKAGE_NAME_CMD).rpm
 	rm -f $(FULL_PACKAGE_NAME_PKG).rpm
+	rm -f $(FULL_PACKAGE_NAME_DYN).rpm
 
 distclean: clean
 

=== modified file 'package/lsb-check.spec.sed'
--- a/package/lsb-check.spec.sed	2012-07-19 00:13:40 +0000
+++ b/package/lsb-check.spec.sed	2012-09-25 16:45:12 +0000
@@ -79,14 +79,14 @@
 #interfaces is flagged; the tool can be told about additional libraries
 #which are to be linked as part of the final link-edit.
 
-#%package -n lsb-dynchk
-#Summary: LSB Dynamic Application Checking tool
-#Group: Development/Tools
+%package -n lsb-dynchk
+Summary: LSB Dynamic Application Checking tool
+Group: Development/Tools
 
-#%description -n lsb-dynchk
-#lsbdynchk is an application checker, one part of a series of checks
-#that a application is LSB compliant. It is used during execution of the
-#application to test the parameters that are passed to LSB interfaces.
+%description -n lsb-dynchk
+lsbdynchk is an application checker, one part of a series of checks
+that a application is LSB compliant. It is used during execution of the
+application to test the parameters that are passed to LSB interfaces.
 
 
 %prep
@@ -94,11 +94,11 @@
 
 %build
 # for 4.1, remove LSB_MODULES=Multimedia
-LSBCC_BESTEFFORT=1 CC=/opt/lsb/bin/lsbcc CXX=/opt/lsb/bin/lsbc++ make LSBVERSION=${RPM_PACKAGE_VERSION} LSBLIBCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBAPPCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBARCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBCMDCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBPKGCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} all test
+LSBCC_BESTEFFORT=1 CC=/opt/lsb/bin/lsbcc CXX=/opt/lsb/bin/lsbc++ make LSBVERSION=${RPM_PACKAGE_VERSION} LSBLIBCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBAPPCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBARCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBCMDCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBPKGCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBDYNCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} all test
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install INSTALL_ROOT=$RPM_BUILD_ROOT/opt/lsb
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_ROOT=/opt/lsb
 
 # libchk
 mkdir -p $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-lib
@@ -126,9 +126,9 @@
 #cp package/README-archk $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-ar/README
 
 # dynchk
-#mkdir -p $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn
-#cp package/Licence $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn
-#cp package/README-dynchk $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn/README
+mkdir -p $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn
+cp package/Licence $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn
+cp package/README-dynchk $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn/README
 
 %files -n lsb-libchk
 %defattr(-,root,root)
@@ -173,14 +173,21 @@
 #/opt/lsb/man/man1/lsbarchk.1
 
 # this rule is outdated, we don't do this; but it's not run anyway, so...
-#%files -n lsb-dynchk
-#%defattr(-,root,root)
-#/opt/lsb
+%files -n lsb-dynchk
+%defattr(-,root,root)
+/opt/lsb/bin/lsbdynchk
+/opt/lsb/%xlib/liblsbdynchk.so.1
+%dir /opt/lsb/doc/lsb-check-dyn
+/opt/lsb/doc/lsb-check-dyn/Licence 
+/opt/lsb/doc/lsb-check-dyn/README
+/opt/lsb/man/man1/lsbdynchk.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 25 2011 Mats Wichmann <mats at linuxfoundation.org>
+- fiddled more with build - dynchk enabled
 * Fri Apr 01 2011 Mats Wichmann <mats at linuxfoundation.org>
 - seems to work now; set version to highest of the pkgs +1 so 4.1.2
 * Sun Mar 27 2011 Mats Wichmann <mats at linuxfoundation.org>

=== modified file 'pkgchk/makefile'
--- a/pkgchk/makefile	2011-03-27 22:21:45 +0000
+++ b/pkgchk/makefile	2012-09-25 16:45:12 +0000
@@ -12,10 +12,10 @@
 	$(CC) $(CFLAGS) -o pkgchk $(OBJS) $(LIB) -lz
 
 install:
-	install -d $(INSTALL_ROOT)/$(BINDIR)
-	install pkgchk $(INSTALL_ROOT)/$(BINDIR)/lsbpkgchk
-	install -d $(INSTALL_ROOT)/$(MANDIR)/man1
-	install lsbpkgchk.1 $(INSTALL_ROOT)/$(MANDIR)/man1/lsbpkgchk.1
+	install -d $(DESTDIR)$(INSTALL_ROOT)/$(BINDIR)
+	install pkgchk $(DESTDIR)$(INSTALL_ROOT)/$(BINDIR)/lsbpkgchk
+	install -d $(DESTDIR)$(INSTALL_ROOT)/$(MANDIR)/man1
+	install lsbpkgchk.1 $(DESTDIR)$(INSTALL_ROOT)/$(MANDIR)/man1/lsbpkgchk.1
 
 test:
 



More information about the lsb-messages mailing list