~olbohlen/oi-userland.git

parent: 7aa3f8ca | patch | commit | ignore whitespace

Andreas Wacknitz

2024-02-01 0710a442dea8da7eba95795de262b5e735a210ab

lmdb: update to 0.9.32 & drop 32 bit

1 files deleted

5 files modified

	components/database/lmdb/Makefile	29 ●●●●● patch \| view \| raw \| blame \| history
	components/database/lmdb/lmdb.license	47 ●●●●● patch \| view \| raw \| blame \| history
	components/database/lmdb/lmdb.p5m	6 ●●●●● patch \| view \| raw \| blame \| history
	components/database/lmdb/manifests/sample-manifest.p5m	8 ●●●●● patch \| view \| raw \| blame \| history
	components/database/lmdb/patches/01-Makefile.patch	36 ●●●●● patch \| view \| raw \| blame \| history
	components/database/lmdb/pkg5	2 ●●●●● patch \| view \| raw \| blame \| history

 components/database/lmdb/Makefile

@@ -13,32 +13,33 @@
# Copyright 2019 Rouven Weiler
#

BUILD_BITS= 64_and_32
BUILD_BITS= 64
BUILD_STYLE= justmake
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME =            lmdb
COMPONENT_VERSION =            0.9.31
COMPONENT_SUMMARY =            Lightning memory-mapped database library
COMPONENT_SRC =                openldap-LMDB_$(COMPONENT_VERSION)
COMPONENT_ARCHIVE =            $(COMPONENT_SRC).tar.bz2
COMPONENT_PROJECT_URL =        https://www.symas.com/lmdb
COMPONENT_ARCHIVE_URL =        https://git.openldap.org/openldap/openldap/-/archive/LMDB_$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH =    sha256:2132b8261d241876ce5fe10a243b2f7e0127eecaaff30039573eadc09e3acee6
COMPONENT_FMRI =            database/lmdb
COMPONENT_CLASSIFICATION =    System/Databases
COMPONENT_LICENSE =            OpenLDAP Public License
COMPONENT_NAME=            lmdb
COMPONENT_VERSION=        0.9.32
COMPONENT_SUMMARY=        Lightning memory-mapped database library
COMPONENT_SRC=            openldap-LMDB_$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=        $(COMPONENT_SRC).tar.bz2
COMPONENT_PROJECT_URL=    https://www.symas.com/lmdb
COMPONENT_ARCHIVE_URL=    https://git.openldap.org/openldap/openldap/-/archive/LMDB_$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH=    sha256:039be48414f71299d04fb01da3e1a6461075bb77eaeeeda36ee5285de804ebf6
COMPONENT_FMRI=            database/lmdb
COMPONENT_CLASSIFICATION=    System/Databases
COMPONENT_LICENSE=        OpenLDAP Public License
COMPONENT_LICENSE_FILE=    libraries/liblmdb/LICENSE

include $(WS_MAKE_RULES)/common.mk

COMPONENT_COPY_ACTION = $(CP) -r $(SOURCE_DIR)/libraries/liblmdb/* $(@D)
COMPONENT_COPY_ACTION= ( $(CLONEY) $(SOURCE_DIR)/libraries/liblmdb/ $(@D) )

COMPONENT_BUILD_ARGS += CC="$(CC)"
COMPONENT_BUILD_ARGS += CFLAGS="$(CFLAGS) -pthread"
COMPONENT_BUILD_ARGS += LDFLAGS="$(LDFLAGS)"
COMPONENT_BUILD_ARGS += SOVERSION="$(COMPONENT_VERSION)"

COMPONENT_INSTALL_ARGS += bindir="$(USRBINDIR.$(BITS))"
COMPONENT_INSTALL_ARGS += bindir="$(USRBINDIR)"
COMPONENT_INSTALL_ARGS += includedir="$(USRINCDIR)"
COMPONENT_INSTALL_ARGS += libdir="$(USRLIBDIR.$(BITS))"
COMPONENT_INSTALL_ARGS += mandir="$(USRSHAREMANDIR)"

 components/database/lmdb/lmdb.license

File was deleted

 components/database/lmdb/lmdb.p5m

@@ -23,10 +23,6 @@

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/bin/$(MACH64)/mdb_copy
file path=usr/bin/$(MACH64)/mdb_dump
file path=usr/bin/$(MACH64)/mdb_load
file path=usr/bin/$(MACH64)/mdb_stat
file path=usr/bin/mdb_copy
file path=usr/bin/mdb_dump
file path=usr/bin/mdb_load
@@ -34,8 +30,6 @@
file path=usr/include/lmdb.h
file path=usr/lib/$(MACH64)/liblmdb-$(COMPONENT_VERSION).so
link path=usr/lib/$(MACH64)/liblmdb.so target=./liblmdb-$(COMPONENT_VERSION).so
file path=usr/lib/liblmdb-$(COMPONENT_VERSION).so
link path=usr/lib/liblmdb.so target=./liblmdb-$(COMPONENT_VERSION).so
file path=usr/share/man/man1/mdb_copy.1
file path=usr/share/man/man1/mdb_dump.1
file path=usr/share/man/man1/mdb_load.1

 components/database/lmdb/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2023 <contributor>
# Copyright 2024 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -23,10 +23,6 @@

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/bin/$(MACH64)/mdb_copy
file path=usr/bin/$(MACH64)/mdb_dump
file path=usr/bin/$(MACH64)/mdb_load
file path=usr/bin/$(MACH64)/mdb_stat
file path=usr/bin/mdb_copy
file path=usr/bin/mdb_dump
file path=usr/bin/mdb_load
@@ -34,8 +30,6 @@
file path=usr/include/lmdb.h
file path=usr/lib/$(MACH64)/liblmdb-$(HUMAN_VERSION).so
link path=usr/lib/$(MACH64)/liblmdb.so target=./liblmdb-$(HUMAN_VERSION).so
file path=usr/lib/liblmdb-$(HUMAN_VERSION).so
link path=usr/lib/liblmdb.so target=./liblmdb-$(HUMAN_VERSION).so
file path=usr/share/man/man1/mdb_copy.1
file path=usr/share/man/man1/mdb_dump.1
file path=usr/share/man/man1/mdb_load.1

 components/database/lmdb/patches/01-Makefile.patch

old mode 100755
new mode 100644
@@ -1,5 +1,5 @@
--- lmdb-LMDB_0.9.23/libraries/liblmdb/Makefile    2019-01-24 06:48:44.393091156 +0000
+++ lmdb-LMDB_0.9.23/libraries/liblmdb/Makefile    2019-01-24 08:25:21.037887427 +0000
--- openldap-LMDB_0.9.32/libraries/liblmdb/Makefile.orig    2024-01-29 19:20:26.000000000 +0100
+++ openldap-LMDB_0.9.32/libraries/liblmdb/Makefile    2024-02-01 08:56:41.845326495 +0100
@@ -18,7 +18,6 @@
 # There may be other macros in mdb.c of interest. You should
 # read mdb.c before changing any of them.
@@ -28,7 +28,7 @@
 IPROGS    = mdb_stat mdb_copy mdb_dump mdb_load
 IDOCS    = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
 PROGS    = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
@@ -51,33 +43,34 @@
@@ -51,6 +43,7 @@
     mkdir -p $(DESTDIR)$(mandir)/man1
     for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done
     for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done
@@ -36,11 +36,9 @@
     for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
     for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
 
 clean:
     rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
@@ -59,26 +52,26 @@
 
-test:    all
+test: all
 test:    all
     rm -rf testdb && mkdir testdb
-    ./mtest && ./mdb_stat testdb
+    LD_LIBRARY_PATH=. ./mtest && LD_LIBRARY_PATH=. ./mdb_stat testdb
@@ -64,20 +62,22 @@
-mtest4:    mtest4.o liblmdb.a
-mtest5:    mtest5.o liblmdb.a
-mtest6:    mtest6.o liblmdb.a
+mdb_stat: mdb_stat.o 
+mdb_copy: mdb_copy.o 
+mdb_dump: mdb_dump.o 
+mdb_load: mdb_load.o 
+mtest:    mtest.o 
+mtest2:    mtest2.o 
+mtest3:    mtest3.o 
+mtest4:    mtest4.o 
+mtest5:    mtest5.o 
+mtest6:    mtest6.o 
-mplay:    mplay.o liblmdb.a
+mdb_stat: mdb_stat.o
+mdb_copy: mdb_copy.o
+mdb_dump: mdb_dump.o
+mdb_load: mdb_load.o
+mtest:    mtest.o
+mtest2:    mtest2.o
+mtest3:    mtest3.o
+mtest4:    mtest4.o
+mtest5:    mtest5.o
+mtest6:    mtest6.o
+mplay:    mplay.o
 
 mdb.o: mdb.c lmdb.h midl.h
     $(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
@@ -91,8 +84,8 @@
@@ -92,8 +85,8 @@
 midl.lo: midl.c midl.h
     $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@
 

 components/database/lmdb/pkg5

@@ -6,4 +6,4 @@
        "database/lmdb"
    ],
    "name": "lmdb"
}
}

			@@ -13,32 +13,33 @@
			# Copyright 2019 Rouven Weiler
			#

			BUILD_BITS= 64_and_32
			BUILD_BITS= 64
			BUILD_STYLE= justmake
			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME = lmdb
			COMPONENT_VERSION = 0.9.31
			COMPONENT_SUMMARY = Lightning memory-mapped database library
			COMPONENT_SRC = openldap-LMDB_$(COMPONENT_VERSION)
			COMPONENT_ARCHIVE = $(COMPONENT_SRC).tar.bz2
			COMPONENT_PROJECT_URL = https://www.symas.com/lmdb
			COMPONENT_ARCHIVE_URL = https://git.openldap.org/openldap/openldap/-/archive/LMDB_$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
			COMPONENT_ARCHIVE_HASH = sha256:2132b8261d241876ce5fe10a243b2f7e0127eecaaff30039573eadc09e3acee6
			COMPONENT_FMRI = database/lmdb
			COMPONENT_CLASSIFICATION = System/Databases
			COMPONENT_LICENSE = OpenLDAP Public License
			COMPONENT_NAME= lmdb
			COMPONENT_VERSION= 0.9.32
			COMPONENT_SUMMARY= Lightning memory-mapped database library
			COMPONENT_SRC= openldap-LMDB_$(COMPONENT_VERSION)
			COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
			COMPONENT_PROJECT_URL= https://www.symas.com/lmdb
			COMPONENT_ARCHIVE_URL= https://git.openldap.org/openldap/openldap/-/archive/LMDB_$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
			COMPONENT_ARCHIVE_HASH= sha256:039be48414f71299d04fb01da3e1a6461075bb77eaeeeda36ee5285de804ebf6
			COMPONENT_FMRI= database/lmdb
			COMPONENT_CLASSIFICATION= System/Databases
			COMPONENT_LICENSE= OpenLDAP Public License
			COMPONENT_LICENSE_FILE= libraries/liblmdb/LICENSE

			include $(WS_MAKE_RULES)/common.mk

			COMPONENT_COPY_ACTION = $(CP) -r $(SOURCE_DIR)/libraries/liblmdb/* $(@D)
			COMPONENT_COPY_ACTION= ( $(CLONEY) $(SOURCE_DIR)/libraries/liblmdb/ $(@D) )

			COMPONENT_BUILD_ARGS += CC="$(CC)"
			COMPONENT_BUILD_ARGS += CFLAGS="$(CFLAGS) -pthread"
			COMPONENT_BUILD_ARGS += LDFLAGS="$(LDFLAGS)"
			COMPONENT_BUILD_ARGS += SOVERSION="$(COMPONENT_VERSION)"

			COMPONENT_INSTALL_ARGS += bindir="$(USRBINDIR.$(BITS))"
			COMPONENT_INSTALL_ARGS += bindir="$(USRBINDIR)"
			COMPONENT_INSTALL_ARGS += includedir="$(USRINCDIR)"
			COMPONENT_INSTALL_ARGS += libdir="$(USRLIBDIR.$(BITS))"
			COMPONENT_INSTALL_ARGS += mandir="$(USRSHAREMANDIR)"

			@@ -23,10 +23,6 @@

			license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

			file path=usr/bin/$(MACH64)/mdb_copy
			file path=usr/bin/$(MACH64)/mdb_dump
			file path=usr/bin/$(MACH64)/mdb_load
			file path=usr/bin/$(MACH64)/mdb_stat
			file path=usr/bin/mdb_copy
			file path=usr/bin/mdb_dump
			file path=usr/bin/mdb_load
			@@ -34,8 +30,6 @@
			file path=usr/include/lmdb.h
			file path=usr/lib/$(MACH64)/liblmdb-$(COMPONENT_VERSION).so
			link path=usr/lib/$(MACH64)/liblmdb.so target=./liblmdb-$(COMPONENT_VERSION).so
			file path=usr/lib/liblmdb-$(COMPONENT_VERSION).so
			link path=usr/lib/liblmdb.so target=./liblmdb-$(COMPONENT_VERSION).so
			file path=usr/share/man/man1/mdb_copy.1
			file path=usr/share/man/man1/mdb_dump.1
			file path=usr/share/man/man1/mdb_load.1

			@@ -10,7 +10,7 @@
			#

			#
			# Copyright 2023 <contributor>
			# Copyright 2024 <contributor>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -23,10 +23,6 @@

			license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

			file path=usr/bin/$(MACH64)/mdb_copy
			file path=usr/bin/$(MACH64)/mdb_dump
			file path=usr/bin/$(MACH64)/mdb_load
			file path=usr/bin/$(MACH64)/mdb_stat
			file path=usr/bin/mdb_copy
			file path=usr/bin/mdb_dump
			file path=usr/bin/mdb_load
			@@ -34,8 +30,6 @@
			file path=usr/include/lmdb.h
			file path=usr/lib/$(MACH64)/liblmdb-$(HUMAN_VERSION).so
			link path=usr/lib/$(MACH64)/liblmdb.so target=./liblmdb-$(HUMAN_VERSION).so
			file path=usr/lib/liblmdb-$(HUMAN_VERSION).so
			link path=usr/lib/liblmdb.so target=./liblmdb-$(HUMAN_VERSION).so
			file path=usr/share/man/man1/mdb_copy.1
			file path=usr/share/man/man1/mdb_dump.1
			file path=usr/share/man/man1/mdb_load.1

			@@ -1,5 +1,5 @@
			--- lmdb-LMDB_0.9.23/libraries/liblmdb/Makefile 2019-01-24 06:48:44.393091156 +0000
			+++ lmdb-LMDB_0.9.23/libraries/liblmdb/Makefile 2019-01-24 08:25:21.037887427 +0000
			--- openldap-LMDB_0.9.32/libraries/liblmdb/Makefile.orig 2024-01-29 19:20:26.000000000 +0100
			+++ openldap-LMDB_0.9.32/libraries/liblmdb/Makefile 2024-02-01 08:56:41.845326495 +0100
			@@ -18,7 +18,6 @@
			# There may be other macros in mdb.c of interest. You should
			# read mdb.c before changing any of them.
			@@ -28,7 +28,7 @@
			IPROGS = mdb_stat mdb_copy mdb_dump mdb_load
			IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
			PROGS = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
			@@ -51,33 +43,34 @@
			@@ -51,6 +43,7 @@
			mkdir -p $(DESTDIR)$(mandir)/man1
			for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done
			for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done
			@@ -36,11 +36,9 @@
			for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
			for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done

			clean:
			rm -rf $(PROGS) .[ao] .[ls]o *~ testdb
			@@ -59,26 +52,26 @@

			-test: all
			+test: all
			test: all
			rm -rf testdb && mkdir testdb
			- ./mtest && ./mdb_stat testdb
			+ LD_LIBRARY_PATH=. ./mtest && LD_LIBRARY_PATH=. ./mdb_stat testdb
			@@ -64,20 +62,22 @@
			-mtest4: mtest4.o liblmdb.a
			-mtest5: mtest5.o liblmdb.a
			-mtest6: mtest6.o liblmdb.a
			+mdb_stat: mdb_stat.o
			+mdb_copy: mdb_copy.o
			+mdb_dump: mdb_dump.o
			+mdb_load: mdb_load.o
			+mtest: mtest.o
			+mtest2: mtest2.o
			+mtest3: mtest3.o
			+mtest4: mtest4.o
			+mtest5: mtest5.o
			+mtest6: mtest6.o
			-mplay: mplay.o liblmdb.a
			+mdb_stat: mdb_stat.o
			+mdb_copy: mdb_copy.o
			+mdb_dump: mdb_dump.o
			+mdb_load: mdb_load.o
			+mtest: mtest.o
			+mtest2: mtest2.o
			+mtest3: mtest3.o
			+mtest4: mtest4.o
			+mtest5: mtest5.o
			+mtest6: mtest6.o
			+mplay: mplay.o

			mdb.o: mdb.c lmdb.h midl.h
			$(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
			@@ -91,8 +84,8 @@
			@@ -92,8 +85,8 @@
			midl.lo: midl.c midl.h
			$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@