diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-04 22:06:03 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-04 22:06:03 +0100 |
commit | 71d64690550602953eea0737507cbc47999b4126 (patch) | |
tree | d4a45e53d34d505a56ab22756162e0018ba5b711 | |
parent | a8c2f992ffdcd61def5614187d77f0f6dcaddb04 (diff) |
fix native compile, make tcl usable
-rw-r--r-- | package/openldap/patches/patch-Makefile_in | 11 | ||||
-rw-r--r-- | package/sqlite/Makefile | 5 | ||||
-rw-r--r-- | package/sqlite/patches/patch-configure | 22 | ||||
-rw-r--r-- | package/tcl/Makefile | 7 |
4 files changed, 41 insertions, 4 deletions
diff --git a/package/openldap/patches/patch-Makefile_in b/package/openldap/patches/patch-Makefile_in new file mode 100644 index 000000000..c248c3f7e --- /dev/null +++ b/package/openldap/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- openldap-2.4.23.orig/Makefile.in 2010-04-13 22:22:14.000000000 +0200 ++++ openldap-2.4.23/Makefile.in 2011-03-04 20:59:55.000000000 +0100 +@@ -13,7 +13,7 @@ + ## top-level directory of the distribution or, alternatively, at + ## <http://www.OpenLDAP.org/license.html>. + +-SUBDIRS= include libraries clients servers tests doc ++SUBDIRS= include libraries clients servers + CLEANDIRS= + INSTALLDIRS= + diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index 175c53518..d1c290edf 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -26,6 +26,7 @@ CONFIGURE_ENV+= config_BUILD_CC="${CC_FOR_BUILD}" \ config_TARGET_CFLAGS="${TARGET_CFLAGS}" \ config_TARGET_READLINE_INC="-I${STAGING_TARGET_DIR}/usr/include" \ config_TARGET_READLINE_LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lreadline -lncurses" + MAKE_FLAGS+= LIBPTHREAD=-lm TARGET_CPPFLAGS+= -DSQLITE_SECURE_DELETE=1 CONFIGURE_ARGS+= --disable-tcl \ @@ -34,8 +35,8 @@ CONFIGURE_ARGS+= --disable-tcl \ post-install: ${INSTALL_DIR} ${IDIR_LIBSQLITE}/usr/lib - ${CP} ${WRKINST}/usr/lib/libsqlite3.so* ${IDIR_LIBSQLITE}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libsqlite3.so* ${IDIR_LIBSQLITE}/usr/lib ${INSTALL_DIR} ${IDIR_SQLITE_CLI}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/sqlite3 ${IDIR_SQLITE_CLI}/usr/bin/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/sqlite3 ${IDIR_SQLITE_CLI}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sqlite/patches/patch-configure b/package/sqlite/patches/patch-configure new file mode 100644 index 000000000..f4a1d91fd --- /dev/null +++ b/package/sqlite/patches/patch-configure @@ -0,0 +1,22 @@ +--- sqlite-3.7.3.orig/configure 2010-10-07 16:48:41.000000000 +0200 ++++ sqlite-3.7.3/configure 2011-03-04 21:58:45.000000000 +0100 +@@ -12389,8 +12389,8 @@ fi + # generate command-line programs that run on the build machine. + # + if test x"$cross_compiling" = xno; then +- BUILD_CC=$CC +- BUILD_CFLAGS=$CFLAGS ++ BUILD_CC=$CC_FOR_BUILD ++ BUILD_CFLAGS=$CFLAGS_FOR_BUILD + else + if test "${BUILD_CC+set}" != set; then + for ac_prog in gcc cc cl +@@ -12437,7 +12437,7 @@ done + + fi + if test "${BUILD_CFLAGS+set}" != set; then +- BUILD_CFLAGS="-g" ++ BUILD_CFLAGS=$CFLAGS_FOR_BUILD + fi + fi + diff --git a/package/tcl/Makefile b/package/tcl/Makefile index 964bb6250..6dbed8f03 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIST}/unix include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TCL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,TCL,tcl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_LDFLAGS+= -ldl CONFIGURE_ENV+= tcl_cv_strstr_unbroken=ok \ @@ -29,9 +29,12 @@ CONFIGURE_ARGS+= --enable-man-symlinks \ --disable-rpath INSTALL_TARGET= install-binaries install-libraries -post-install: +tcl-install: ${INSTALL_DIR} ${IDIR_TCL}/usr/lib ${IDIR_TCL}/usr/bin ${CP} ${WRKINST}/usr/bin/* ${IDIR_TCL}/usr/bin + cd ${IDIR_TCL}/usr/bin && ln -sf tclsh8.5 tclsh ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_TCL}/usr/lib + ${CP} ${WRKINST}/usr/lib/tcl8 ${IDIR_TCL}/usr/lib + ${CP} ${WRKINST}/usr/lib/tcl8.5 ${IDIR_TCL}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk |