jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tdb: make sure shlib is built before the progs, disable parallel build.

Browse source
This commit is contained in:
Juan RP 2011-11-18 09:34:31 +01:00
parent bc5f57f274
commit 74faae022e
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
srcpkgs/tdb/patches/tdb-utils-linking-order.patch
View file

@ -5,18 +5,29 @@
bin/tdbtool$(EXEEXT): tools/tdbtool.o $(TDB_LIB)
- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb $(TDB_DEPS)
+ $(CC) $(CFLAGS) $(LDFLAGS) tools/tdbtool.o $(TDB_DEPS) $(TDB_SOLIB) -o bin/tdbtool
+ $(CC) $(CFLAGS) $(LDFLAGS) tools/tdbtool.o $(TDB_DEPS) $(srcdir)/$(TDB_SOLIB) -o bin/tdbtool
bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb $(TDB_DEPS)
bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB)
- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb $(TDB_DEPS)
+ $(CC) $(CFLAGS) $(LDFLAGS) tools/tdbdump.o $(TDB_DEPS) $(TDB_SOLIB) -o bin/tdbdump
+ $(CC) $(CFLAGS) $(LDFLAGS) tools/tdbdump.o $(TDB_DEPS) $(srcdir)/$(TDB_SOLIB) -o bin/tdbdump
bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB)
- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb $(TDB_DEPS)
+ $(CC) $(CFLAGS) $(LDFLAGS) tools/tdbbackup.o $(TDB_DEPS) $(TDB_SOLIB) -o bin/tdbbackup
+ $(CC) $(CFLAGS) $(LDFLAGS) tools/tdbbackup.o $(TDB_DEPS) $(srcdir)/$(TDB_SOLIB) -o bin/tdbbackup
test:: abi_checks
--- Makefile.in.orig 2011-11-18 09:26:39.467966708 +0100
+++ Makefile.in 2011-11-18 09:27:01.555448949 +0100
@@ -48,7 +48,7 @@ default: all
include $(tdbdir)/tdb.mk
include $(tdbdir)/rules.mk
-all:: showflags dirs $(PROGS) $(TDB_SOLIB) libtdb.a $(PYTHON_BUILD_TARGET) $(EXTRA_TARGETS)
+all:: showflags dirs $(TDB_SOLIB) libtdb.a $(PROGS) $(PYTHON_BUILD_TARGET) $(EXTRA_TARGETS)
install:: all
$(TDB_SOLIB): $(TDB_OBJ)

1
srcpkgs/tdb/template
View file

@ -12,6 +12,7 @@ long_desc="
TDB features, unlike GDBM, multiple writers support with appropriate locking
and transactions."
disable_parallel_build=yes
subpackages="libtdb tdb-devel tdb-python"
Add_dependency build pkg-config