diff options
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | mk/package.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 8 | ||||
| -rw-r--r-- | rules.mk | 6 | ||||
| -rw-r--r-- | tools/adk/Makefile | 13 | ||||
| -rw-r--r-- | tools/cpio/Makefile | 4 | ||||
| -rw-r--r-- | tools/mkcrypt/Makefile | 6 |
8 files changed, 24 insertions, 36 deletions
@@ -191,20 +191,9 @@ NO_ERROR=0 echo "GMAKE:=$$(which gmake)" >>prereq.mk ;\ fi @echo "GNU_HOST_NAME:=$$(${CC} -dumpmachine)" >>prereq.mk - @echo "HOST_ARCH:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \ - -e 's/sparc.*/sparc/' \ - -e 's/arm.*/arm/g' \ - -e 's/m68k.*/m68k/' \ - -e 's/ppc/powerpc/g' \ - -e 's/v850.*/v850/g' \ - -e 's/sh[234]/sh/' \ - -e 's/mips-.*/mips/' \ - -e 's/mipsel-.*/mipsel/' \ - -e 's/cris.*/cris/' \ - -e 's/i[3-9]86/i386/' \ - )" >>prereq.mk @echo "HOSTARCH:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \ -e 's/sparc.*/sparc/' \ + -e 's/armeb.*/armeb/g' \ -e 's/arm.*/arm/g' \ -e 's/m68k.*/m68k/' \ -e 's/v850.*/v850/g' \ @@ -215,11 +204,7 @@ NO_ERROR=0 -e 's/i[3-9]86/x86/' \ )" >>prereq.mk @echo 'HOSTCC:=${CC}' >>prereq.mk - @echo 'HOSTCFLAGS:=-O2' >>prereq.mk @echo 'HOSTCXX:=${CXX}' >>prereq.mk - @echo 'HOSTCXXFLAGS:=-O2' >>prereq.mk - @echo "HOST_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk - @echo "PKG_HOSTLIB_DIR:=$$(pkg-config --variable pc_path pkg-config 2>/dev/null)" >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk @@ -228,6 +213,8 @@ NO_ERROR=0 @echo "_PATH:=$$PATH" >>prereq.mk @echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk @echo "SHELL:=$$(which bash)" >>prereq.mk + @echo "HOST_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk + @echo "PKG_HOSTLIB_DIR:=$$(pkg-config --variable pc_path pkg-config 2>/dev/null)" >>prereq.mk @env NO_ERROR=${NO_ERROR} BASH="$$(which bash)" \ CC='${CC}' CPPFLAGS='${CPPFLAGS}' \ bash scripts/scan-tools.sh diff --git a/mk/package.mk b/mk/package.mk index 59fb6a805..d9d10c79d 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -219,7 +219,7 @@ endif find usr ! -type d 2>/dev/null | \ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '$${STAGING_PKG_DIR}/$(1)' | \ - $(TOPDIR)/bin/tools/cpio -padlmu '$${STAGING_TARGET_DIR}' + $(TOOLS_DIR)/cpio -padlmu '$${STAGING_TARGET_DIR}' @cd '$${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PKG_DIR}/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 6e5fdc3a5..f91e1bb45 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -170,7 +170,7 @@ endif find usr ! -type d 2>/dev/null | \ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \ - $(TOPDIR)/bin/tools/cpio -padlmu '${STAGING_TARGET_DIR}' + $(TOOLS_DIR)/cpio -padlmu '${STAGING_TARGET_DIR}' @cd '${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$' \ '${STAGING_PKG_DIR}/${PKG_NAME}' | while read fn; do \ chmod u+w $$fn; \ diff --git a/mk/vars.mk b/mk/vars.mk index b376140ed..37461e981 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -108,19 +108,19 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ cd ${WRKDIR} && \ for file in ${FULLDISTFILES}; do case $$file in \ *.cpio) \ - cat $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ + cat $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar) \ tar -xf $$file ;; \ *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \ - gzip -dc $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ + gzip -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar.Z | *.tar.gz | *.taz | *.tgz) \ gzip -dc $$file | tar -xf - ;; \ *.cpio.bz2 | *.cbz) \ - bzip2 -dc $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ + bzip2 -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ - cat $$file | $(TOPDIR)/bin/tools/cpio -ivd -H zip ;; \ + cat $$file | $(TOOLS_DIR)/cpio -ivd -H zip ;; \ *.arm) \ cp $$file ${WRKDIR} ;; \ *) \ @@ -45,11 +45,13 @@ endif include $(TOPDIR)/mk/vars.mk -export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH +export BASH HOSTCC HOSTCXX MAKE LANGUAGE LC_ALL OStype PATH +HOSTCFLAGS?= -O2 +HOSTCXXFLAGS?= -O2 HOSTCPPFLAGS?= HOSTLDFLAGS?= -TARGET_CFLAGS:= $(strip -fno-ident -fhonour-copts ${TARGET_CFLAGS}) +TARGET_CFLAGS:= $(strip ${TARGET_CFLAGS} -fno-ident -fhonour-copts) TARGET_CC:= $(strip ${TARGET_CC}) TARGET_CXX:= $(strip ${TARGET_CXX}) diff --git a/tools/adk/Makefile b/tools/adk/Makefile index 1f8c2186e..638935e5e 100644 --- a/tools/adk/Makefile +++ b/tools/adk/Makefile @@ -5,16 +5,15 @@ include $(TOPDIR)/rules.mk CCANDLD.c= ${HOSTCC} ${HOSTCFLAGS} ${HOSTCPPFLAGS} ${HOSTLDFLAGS} -${TOPDIR}/bin/tools/depmaker: - ${CCANDLD.c} -o $(TOPDIR)/bin/tools/depmaker depmaker.c +${TOOLS_DIR}/depmaker: + ${CCANDLD.c} -Wall -o $@ depmaker.c -${TOPDIR}/bin/tools/pkgrebuild: - ${CCANDLD.c} -o $(TOPDIR)/bin/tools/pkgrebuild pkgrebuild.c strmap.c +${TOOLS_DIR}/pkgrebuild: + ${CCANDLD.c} -Wall -o $@ pkgrebuild.c strmap.c -${TOPDIR}/bin/tools/dkgetsz: +${TOOLS_DIR}/dkgetsz: ${CCANDLD.c} -Wall -o $@ dkgetsz.c -install: ${TOPDIR}/bin/tools/depmaker ${TOPDIR}/bin/tools/pkgrebuild \ - ${TOPDIR}/bin/tools/dkgetsz +install: ${TOOLS_DIR}/depmaker ${TOOLS_DIR}/pkgrebuild ${TOOLS_DIR}/dkgetsz include $(TOPDIR)/mk/tools.mk diff --git a/tools/cpio/Makefile b/tools/cpio/Makefile index bbf138918..a012c43a5 100644 --- a/tools/cpio/Makefile +++ b/tools/cpio/Makefile @@ -27,9 +27,9 @@ SRCS+= \ src/nonpax.c \ src/cpio.c -${TOPDIR}/bin/tools/cpio: ${SRCS} +${TOOLS_DIR}/cpio: ${SRCS} ${HOSTCC} ${HOSTCFLAGS} -D_GNU_SOURCE -Isrc -o $@ $^ -install: ${TOPDIR}/bin/tools/cpio +install: ${TOOLS_DIR}/cpio include $(TOPDIR)/mk/tools.mk diff --git a/tools/mkcrypt/Makefile b/tools/mkcrypt/Makefile index 54548c39e..1708f9f13 100644 --- a/tools/mkcrypt/Makefile +++ b/tools/mkcrypt/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk -${TOPDIR}/bin/tools/mkcrypt: - $(HOSTCC) ${HOSTCFLAGS} -o $(TOPDIR)/bin/tools/mkcrypt mkcrypt.c +${TOOLS_DIR}/mkcrypt: + $(HOSTCC) ${HOSTCFLAGS} -o $@ mkcrypt.c -install: ${TOPDIR}/bin/tools/mkcrypt +install: ${TOOLS_DIR}/mkcrypt include $(TOPDIR)/mk/tools.mk |