From 649ba6d42cd157a598af46fb94585e1e9333039d Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Tue, 28 Nov 2006 04:33:22 +0000 Subject: [PATCH] FLAIM. Changes to support 64-bit Ubuntu packages. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1003 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- flaim/ChangeLog.ubuntu | 9 +++++ flaim/Makefile | 14 ++++++- flaim/debian/control | 58 +++++++++++++++++++++-------- flaim/debian/lib64flaim-dev.install | 3 ++ flaim/debian/lib64flaim.install | 1 + flaim/debian/libflaim-dev.install | 1 - flaim/debian/rules | 29 ++++++++++----- 7 files changed, 87 insertions(+), 28 deletions(-) create mode 100644 flaim/debian/lib64flaim-dev.install create mode 100644 flaim/debian/lib64flaim.install diff --git a/flaim/ChangeLog.ubuntu b/flaim/ChangeLog.ubuntu index 9779ac0..c1c2df0 100644 --- a/flaim/ChangeLog.ubuntu +++ b/flaim/ChangeLog.ubuntu @@ -1,3 +1,12 @@ +libflaim (4.9.1003-0ubuntu1) edgy; urgency=low + + * Added support for 64-bit libraries + * Removed /zp1 compiler switch and added pragmas to do one-byte packing on structures + * Fixed mis-typed member of OPT_INFO structure + * Corrected errors in the spec file + + -- Andrew Hodgkinson (Sr. Software Engineer) Wed, 4 Oct 2006 11:50:56 -0600 + libflaim (4.9.0-0ubuntu1) edgy; urgency=low * Removed shared libraries from the development package diff --git a/flaim/Makefile b/flaim/Makefile index d6d0889..7627094 100644 --- a/flaim/Makefile +++ b/flaim/Makefile @@ -61,8 +61,8 @@ version = $(major_version).$(minor_version).$(svn_revision) # 5. If any interfaces have been added since the last public release, increment age # 6. If any interfaces have been removed since the last public release, set age to 0 -so_current = 4 -so_revision = 1 +so_current = 5 +so_revision = 2 so_age = 0 shared_lib_version = @@ -508,6 +508,12 @@ ifneq (,$(findstring sparcgeneric,$(MAKECMDGOALS))) sparc_generic = yes endif +ifneq (,$(findstring 32bit,$(MAKECMDGOALS))) + ifeq ($(target_processor_family),sparc) + sparc_generic = yes + endif +endif + # -- Helper functions -- define normpath @@ -1024,6 +1030,10 @@ ifdef unix_target ifeq ($(target_build_type),release) ccflags += $(gcc_optimization_flags) endif + + ifdef sparc_generic + ccdefs += FLM_SPARC_GENERIC + endif endif ifeq ($(target_os_family),solaris) diff --git a/flaim/debian/control b/flaim/debian/control index a7b004b..f44ee34 100644 --- a/flaim/debian/control +++ b/flaim/debian/control @@ -1,26 +1,13 @@ Source: libflaim Priority: optional Maintainer: Andrew Hodgkinson (Sr. Software Engineer) -Build-Depends: debhelper (>= 5.0), libncurses-dev +Build-Depends: debhelper (>= 5.0), lib64ncurses5-dev [sparc amd64], libncurses5-dev [sparc i386 amd64] Standards-Version: 3.7.2 Section: libs -Package: libflaim-dev -Section: libdevel -Architecture: any -Depends: libflaim (= ${Source-Version}) -Description: Embeddable cross-platform database engine - FLAIM is an embeddable cross-platform database engine that provides a - rich, powerful, easy-to-use feature set. It is the database engine used - by Novell eDirectory. It has proven to be highly scalable, reliable, - and robust. It is available on a wide variety of 32 bit and 64 bit - platforms. - . - Homepage: http://www.bandit-project.org/index.php/FLAIM - Package: libflaim Section: libs -Architecture: any +Architecture: i386 amd64 sparc Depends: ${shlibs:Depends} Description: Embeddable cross-platform database engine FLAIM is an embeddable cross-platform database engine that provides a @@ -29,4 +16,43 @@ Description: Embeddable cross-platform database engine and robust. It is available on a wide variety of 32 bit and 64 bit platforms. . - Homepage: http://www.bandit-project.org/index.php/FLAIM + Homepage: http://developer.novell.com/wiki/index.php/FLAIM + +Package: lib64flaim +Section: libs +Architecture: sparc amd64 +Depends: ${shlibs:Depends} +Description: Embeddable cross-platform database engine + FLAIM is an embeddable cross-platform database engine that provides a + rich, powerful, easy-to-use feature set. It is the database engine used + by Novell eDirectory. It has proven to be highly scalable, reliable, + and robust. It is available on a wide variety of 32 bit and 64 bit + platforms. + . + Homepage: http://developer.novell.com/wiki/index.php/FLAIM + +Package: libflaim-dev +Section: libdevel +Architecture: i386 amd64 sparc +Depends: libflaim (= ${Source-Version}) +Description: Embeddable cross-platform database engine + FLAIM is an embeddable cross-platform database engine that provides a + rich, powerful, easy-to-use feature set. It is the database engine used + by Novell eDirectory. It has proven to be highly scalable, reliable, + and robust. It is available on a wide variety of 32 bit and 64 bit + platforms. + . + Homepage: http://developer.novell.com/wiki/index.php/FLAIM + +Package: lib64flaim-dev +Section: libdevel +Architecture: sparc amd64 +Depends: lib64flaim (= ${Source-Version}) +Description: Embeddable cross-platform database engine + FLAIM is an embeddable cross-platform database engine that provides a + rich, powerful, easy-to-use feature set. It is the database engine used + by Novell eDirectory. It has proven to be highly scalable, reliable, + and robust. It is available on a wide variety of 32 bit and 64 bit + platforms. + . + Homepage: http://developer.novell.com/wiki/index.php/FLAIM diff --git a/flaim/debian/lib64flaim-dev.install b/flaim/debian/lib64flaim-dev.install new file mode 100644 index 0000000..f10ee22 --- /dev/null +++ b/flaim/debian/lib64flaim-dev.install @@ -0,0 +1,3 @@ +usr/include/* +usr/lib64/lib*.a +usr/lib64/lib*.so diff --git a/flaim/debian/lib64flaim.install b/flaim/debian/lib64flaim.install new file mode 100644 index 0000000..b4d035c --- /dev/null +++ b/flaim/debian/lib64flaim.install @@ -0,0 +1 @@ +usr/lib64/lib*.so.* diff --git a/flaim/debian/libflaim-dev.install b/flaim/debian/libflaim-dev.install index 6cd8ddd..d1bffed 100644 --- a/flaim/debian/libflaim-dev.install +++ b/flaim/debian/libflaim-dev.install @@ -1,4 +1,3 @@ usr/include/* usr/lib/lib*.a usr/lib/lib*.so -usr/lib/pkgconfig/* diff --git a/flaim/debian/rules b/flaim/debian/rules index 95373d7..e3b1d0a 100644 --- a/flaim/debian/rules +++ b/flaim/debian/rules @@ -5,7 +5,15 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) OSTYPE ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) HOSTTYPE ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) CFLAGS = -Wall -g +PLAT64BIT = no +ifeq (sparc,$(HOSTTYPE)) + PLAT64BIT = yes +endif + +ifeq (amd64,$(HOSTTYPE)) + PLAT64BIT = yes +endif ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -16,24 +24,26 @@ endif configure: configure-stamp configure-stamp: dh_testdir - touch configure-stamp build: build-stamp build-stamp: configure-stamp dh_testdir - $(MAKE) OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) - + $(MAKE) OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) -j 2 +ifeq ($(PLAT64BIT),yes) + $(MAKE) 32bit OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) -j 2 +endif touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - - -$(MAKE) clean OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) - + -$(MAKE) clean OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) -j 2 +ifeq ($(PLAT64BIT),yes) + -$(MAKE) 32bit clean OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) -j 2 +endif dh_clean install: build @@ -41,9 +51,10 @@ install: build dh_testroot dh_clean -k dh_installdirs - - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) - + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) -j 2 +ifeq ($(PLAT64BIT),yes) + $(MAKE) 32bit install DESTDIR=$(CURDIR)/debian/tmp OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) -j 2 +endif binary-indep: build install