diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/libdb | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/libdb')
| -rw-r--r-- | package/libdb/Makefile | 17 | ||||
| -rw-r--r-- | package/libdb/ipkg/libdb.control | 4 |
2 files changed, 7 insertions, 14 deletions
diff --git a/package/libdb/Makefile b/package/libdb/Makefile index 5b812c1f8..782e913d6 100644 --- a/package/libdb/Makefile +++ b/package/libdb/Makefile @@ -9,24 +9,22 @@ PKG_NAME:= libdb PKG_VERSION:= 4.7.25 PKG_RELEASE:= 1 PKG_MD5SUM:= ec2b87e833779681a0c3a814aa71359e -MASTER_SITES:= http://www.oracle.com/technology/software/products/berkeley-db/ +PKG_DESCR:= disk file format database which stores key/data-pairs in single files +PKG_SECTION:= libs +PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db +PKG_SITES:= http://www.openadk.org/distfiles/ + DISTFILES:= db-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/db-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE})) - -ifeq ($(DEBUG),1) -PKG_CONFIGURE:= --enable-debug -else -PKG_CONFIGURE:= --disable-debug -endif +$(eval $(call PKG_template,LIBDB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-configure: (cd ${WRKBUILD}/build_unix ; \ ${TARGET_CONFIGURE_OPTS} \ - CFLAGS="${TARGET_CFLAGS_ARCH} -pipe" \ + CFLAGS="${TARGET_CFLAGS}" \ CPPFLAGS="-I${STAGING_DIR}/usr/include" \ LDFLAGS="-L${STAGING_DIR}/usr/lib" \ ../dist/configure \ @@ -66,7 +64,6 @@ do-configure: --disable-cryptography \ --disable-queue \ --with-mutex=UNIX/fcntl \ - ${PKG_CONFIGURE} \ ); do-install: diff --git a/package/libdb/ipkg/libdb.control b/package/libdb/ipkg/libdb.control deleted file mode 100644 index 28605c38f..000000000 --- a/package/libdb/ipkg/libdb.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libdb -Priority: optional -Section: libs -Description: disk file format database which stores key/data-pairs in single files |