From 3824d7e35f7963f29baa6f2e96f552c2ecdbb50e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Nov 2013 17:27:16 +0100 Subject: fix runtime depends --- package/e2fsprogs/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package') diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index d7b44621a..4b7342197 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -30,16 +30,16 @@ PKGSD_E2FSCK_STATIC:= Static build of e2fsck PKGSC_E2FSCK_STATIC:= fs PKGSD_RESIZE2FS:= Resize FS utility PKGSC_RESIZE2FS:= fs -PKGSS_RESIZE2FS:= libe2fs +PKGSS_RESIZE2FS:= libe2fs libcom-err libblkid PKGSD_TUNE2FS:= Tune2FS utility PKGSC_TUNE2FS:= fs -PKGSS_TUNE2FS:= libe2fs +PKGSS_TUNE2FS:= libe2fs libcom-err libblkid libuuid PKGSD_E2FSCK:= E2fsck utility PKGSC_E2FSCK:= fs -PKGSS_E2FSCK:= libe2fs +PKGSS_E2FSCK:= libe2fs libcom-err libblkid libuuid PKGSD_MKE2FS:= Mke2fs utility PKGSC_MKE2FS:= fs -PKGSS_MKE2FS:= libe2fs +PKGSS_MKE2FS:= libe2fs libcom-err libblkid libuuid include ${TOPDIR}/mk/package.mk -- cgit v1.2.3 From 163c729ef251a87ca61731bf63892607953e3fa1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Nov 2013 17:29:47 +0100 Subject: add linker scripts --- package/glibc/Makefile | 12 ++++++++++++ package/glibc/files/libc.so.i586 | 5 +++++ package/glibc/files/libc.so.i686 | 5 +++++ package/glibc/files/libc.so.mips | 5 +++++ package/glibc/files/libc.so.mips64 | 5 +++++ package/glibc/files/libc.so.mips64el | 5 +++++ package/glibc/files/libc.so.mipsel | 5 +++++ 7 files changed, 42 insertions(+) create mode 100644 package/glibc/files/libc.so.i586 create mode 100644 package/glibc/files/libc.so.i686 create mode 100644 package/glibc/files/libc.so.mips create mode 100644 package/glibc/files/libc.so.mips64 create mode 100644 package/glibc/files/libc.so.mips64el create mode 100644 package/glibc/files/libc.so.mipsel (limited to 'package') diff --git a/package/glibc/Makefile b/package/glibc/Makefile index af70e125f..d6d1bf3ce 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -52,13 +52,25 @@ glibc-dev-install: # install linker script -cp ./files/libc.so.$(CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so ifeq ($(ADK_TARGET_ABI_O32),y) +ifeq ($(ADK_big),y) + $(SED) "s#@@ELFFORMAT@@#elf32-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so +else $(SED) "s#@@ELFFORMAT@@#elf32-tradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so endif +endif ifeq ($(ADK_TARGET_ABI_N32),y) +ifeq ($(ADK_big),y) + $(SED) "s#@@ELFFORMAT@@#elf32-ntradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so +else $(SED) "s#@@ELFFORMAT@@#elf32-ntradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so endif +endif ifeq ($(ADK_TARGET_ABI_N64),y) +ifeq ($(ADK_big),y) + $(SED) "s#@@ELFFORMAT@@#elf64-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so +else $(SED) "s#@@ELFFORMAT@@#elf64-tradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so +endif endif ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib diff --git a/package/glibc/files/libc.so.i586 b/package/glibc/files/libc.so.i586 new file mode 100644 index 000000000..cd8724cc5 --- /dev/null +++ b/package/glibc/files/libc.so.i586 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf32-i386) +GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) diff --git a/package/glibc/files/libc.so.i686 b/package/glibc/files/libc.so.i686 new file mode 100644 index 000000000..cd8724cc5 --- /dev/null +++ b/package/glibc/files/libc.so.i686 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf32-i386) +GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) diff --git a/package/glibc/files/libc.so.mips b/package/glibc/files/libc.so.mips new file mode 100644 index 000000000..9e73ea39c --- /dev/null +++ b/package/glibc/files/libc.so.mips @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(@@ELFTARGET@@) + GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) ) diff --git a/package/glibc/files/libc.so.mips64 b/package/glibc/files/libc.so.mips64 new file mode 100644 index 000000000..9e73ea39c --- /dev/null +++ b/package/glibc/files/libc.so.mips64 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(@@ELFTARGET@@) + GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) ) diff --git a/package/glibc/files/libc.so.mips64el b/package/glibc/files/libc.so.mips64el new file mode 100644 index 000000000..9e73ea39c --- /dev/null +++ b/package/glibc/files/libc.so.mips64el @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(@@ELFTARGET@@) + GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) ) diff --git a/package/glibc/files/libc.so.mipsel b/package/glibc/files/libc.so.mipsel new file mode 100644 index 000000000..9e73ea39c --- /dev/null +++ b/package/glibc/files/libc.so.mipsel @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(@@ELFTARGET@@) + GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) ) -- cgit v1.2.3 From 5c53c898d354eded2834e43550d299cb1c58ec58 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Nov 2013 17:30:05 +0100 Subject: use flex-host --- package/bc/Makefile | 7 ++++--- package/flex/Makefile | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'package') diff --git a/package/bc/Makefile b/package/bc/Makefile index 3ee37411b..d4af2f264 100644 --- a/package/bc/Makefile +++ b/package/bc/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d44b5dddebd8a7a7309aea6c36fda117 PKG_DESCR:= An arbitrary precision calculator language PKG_SECTION:= utils +PKG_BUILDDEP:= flex-host PKG_URL:= http://www.gnu.org/software/bc/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/bc/ @@ -19,11 +20,11 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -post-install: - # bc +bc-install: ${INSTALL_DIR} ${IDIR_BC}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/bc/bc ${IDIR_BC}/usr/bin/bc - # dc + +dc-install: ${INSTALL_DIR} ${IDIR_DC}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/dc/dc ${IDIR_DC}/usr/bin/dc diff --git a/package/flex/Makefile b/package/flex/Makefile index 221f8b5bf..84bfb9c38 100644 --- a/package/flex/Makefile +++ b/package/flex/Makefile @@ -9,15 +9,19 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 201d3f38758d95436cbc64903386de0b PKG_DESCR:= fast lexical analyzer PKG_SECTION:= lang -PKG_BUILDDEP:= m4-host +PKG_BUILDDEP:= m4-host flex-host PKG_URL:= http://flex.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} PKG_OPTS:= dev +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + flex-install: ${INSTALL_DIR} ${IDIR_FLEX}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin @@ -26,4 +30,5 @@ flex-install: ${CP} ${WRKINST}/usr/lib/libfl.a \ ${IDIR_FLEX_DEV}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 93781b0afff1f5f7f89160c8983ed6e54242ccf3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Nov 2013 17:31:59 +0100 Subject: not ready for cross-compile --- package/cmake/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/cmake/Makefile b/package/cmake/Makefile index 322f8878f..3b33ee165 100644 --- a/package/cmake/Makefile +++ b/package/cmake/Makefile @@ -5,18 +5,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:= cmake PKG_VERSION:= 2.8.12 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 105bc6d21cc2e9b6aff901e43c53afea PKG_DESCR:= cmake utility PKG_SECTION:= lang PKG_URL:= http://www.cmake.org/ PKG_SITES:= http://www.cmake.org/files/v2.8/ +PKG_TARGET_DEPENDS:= native + include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE})) -#$(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) HOST_STYLE:= manual CONFIG_STYLE:= manual -- cgit v1.2.3