topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- use $if variable

master
vanhofen 5 years ago
parent
3363820fb6
commit
7c46a70b38
5 changed files with 36 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      make/ni.mk
  2. 12
      make/target-development.mk
  3. 5
      make/target-libs-static.mk
  4. 49
      make/target-libs.mk
  5. 39
      make/target-tools.mk

2
make/ni.mk
View File

@ -5,7 +5,7 @@
BOXMODEL_IMAGE = apollo kronos kronos_v2 hd51 bre2ze4k BOXMODEL_IMAGE = apollo kronos kronos_v2 hd51 bre2ze4k
ifneq ($(DEBUG), yes) ifneq ($(DEBUG), yes)
BOXMODEL_IMAGE += nevis BOXMODEL_IMAGE += nevis
endif endif
images \ images \

12
make/target-development.mk
View File

@ -3,12 +3,10 @@
# #
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
VALGRIND_TARGET = valgrind3 VALGRIND_TARGET = $(if $(filter $(BOXSERIES), hd1), valgrind12305, valgrind3)
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1))
VALGRIND_TARGET = valgrind12305
endif
valgrind: $(VALGRIND_TARGET) $(D)/valgrind: $(VALGRIND_TARGET)
$(TOUCH)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -124,7 +122,3 @@ $(D)/gdb: $(GDB_DEPS) $(ARCHIVE)/$(GDB_SOURCE) | $(TARGET_DIR)
find $(TARGET_SHARE_DIR)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm -- find $(TARGET_SHARE_DIR)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm --
$(REMOVE)/$(GDB_TMP) $(REMOVE)/$(GDB_TMP)
$(TOUCH) $(TOUCH)
# -----------------------------------------------------------------------------
PHONY += valgrind

5
make/target-libs-static.mk
View File

@ -20,10 +20,7 @@ CORTEX-STRINGS_URL = http://git.linaro.org/git-ro/toolchain/cortex-strings.gi
$(ARCHIVE)/$(CORTEX-STRINGS_SOURCE): $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE):
$(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_URL) $(CORTEX-STRINGS_VER) $(notdir $@) $(ARCHIVE) $(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_URL) $(CORTEX-STRINGS_VER) $(notdir $@) $(ARCHIVE)
CORTEX-STRINGS_CONF = $(EMPTY) CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES), hd51 bre2ze4k), --with-neon, --without-neon)
ifneq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
CORTEX-STRINGS_CONF = --without-neon
endif
cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la
$(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE) | $(TARGET_DIR) $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE) | $(TARGET_DIR)

49
make/target-libs.mk
View File

@ -162,10 +162,7 @@ $(ARCHIVE)/$(LIBCURL_SOURCE):
LIBCURL_DEPS = $(D)/zlib $(D)/openssl $(D)/rtmpdump $(D)/ca-bundle LIBCURL_DEPS = $(D)/zlib $(D)/openssl $(D)/rtmpdump $(D)/ca-bundle
LIBCURL_IPV6 = --enable-ipv6 LIBCURL_CONF = $(if $(filter $(BOXSERIES), hd1), --disable-ipv6, --enable-ipv6)
ifeq ($(BOXSERIES), hd1)
LIBCURL_IPV6 = --disable-ipv6
endif
$(D)/libcurl: $(LIBCURL_DEPS) $(ARCHIVE)/$(LIBCURL_SOURCE) | $(TARGET_DIR) $(D)/libcurl: $(LIBCURL_DEPS) $(ARCHIVE)/$(LIBCURL_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(LIBCURL_TMP) $(REMOVE)/$(LIBCURL_TMP)
@ -194,8 +191,8 @@ $(D)/libcurl: $(LIBCURL_DEPS) $(ARCHIVE)/$(LIBCURL_SOURCE) | $(TARGET_DIR)
--with-random=/dev/urandom \ --with-random=/dev/urandom \
--with-ssl=$(TARGET_DIR) \ --with-ssl=$(TARGET_DIR) \
--with-librtmp=$(TARGET_LIB_DIR) \ --with-librtmp=$(TARGET_LIB_DIR) \
$(LIBCURL_IPV6) \
--enable-optimize \ --enable-optimize \
$(LIBCURL_CONF) \
; \ ; \
$(MAKE) all; \ $(MAKE) all; \
$(MAKE) install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
@ -221,10 +218,7 @@ LIBPNG_PATCH = libpng-Disable-pngfix-and-png-fix-itxt.patch
LIBPNG_DEPS = $(D)/zlib LIBPNG_DEPS = $(D)/zlib
LIBPNG_CONF = $(EMPTY) LIBPNG_CONF = $(if $(filter $(BOXSERIES), hd51 bre2ze4k), --enable-arm-neon, --disable-arm-neon)
ifneq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
LIBPNG_CONF = --disable-arm-neon
endif
$(D)/libpng: $(LIBPNG_DEPS) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR) $(D)/libpng: $(LIBPNG_DEPS) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(LIBPNG_TMP) $(REMOVE)/$(LIBPNG_TMP)
@ -235,8 +229,8 @@ $(D)/libpng: $(LIBPNG_DEPS) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR)
--prefix= \ --prefix= \
--mandir=$(remove-mandir) \ --mandir=$(remove-mandir) \
--enable-silent-rules \ --enable-silent-rules \
$(LIBPNG_CONF) \
--disable-static \ --disable-static \
$(LIBPNG_CONF) \
; \ ; \
$(MAKE) all; \ $(MAKE) all; \
$(MAKE) install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
@ -257,12 +251,12 @@ FREETYPE_URL = https://sourceforge.net/projects/freetype/files/freetype2/$(FR
$(ARCHIVE)/$(FREETYPE_SOURCE): $(ARCHIVE)/$(FREETYPE_SOURCE):
$(DOWNLOAD) $(FREETYPE_URL)/$(FREETYPE_SOURCE) $(DOWNLOAD) $(FREETYPE_URL)/$(FREETYPE_SOURCE)
FREETYPE_DEPS = $(D)/zlib $(D)/libpng
FREETYPE_PATCH = freetype2-subpixel.patch FREETYPE_PATCH = freetype2-subpixel.patch
FREETYPE_PATCH += freetype2-config.patch FREETYPE_PATCH += freetype2-config.patch
FREETYPE_PATCH += freetype2-pkgconf.patch FREETYPE_PATCH += freetype2-pkgconf.patch
FREETYPE_DEPS = $(D)/zlib $(D)/libpng
$(D)/freetype: $(FREETYPE_DEPS) $(ARCHIVE)/$(FREETYPE_SOURCE) | $(TARGET_DIR) $(D)/freetype: $(FREETYPE_DEPS) $(ARCHIVE)/$(FREETYPE_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(FREETYPE_TMP) $(REMOVE)/$(FREETYPE_TMP)
$(UNTAR)/$(FREETYPE_SOURCE) $(UNTAR)/$(FREETYPE_SOURCE)
@ -298,11 +292,7 @@ $(D)/freetype: $(FREETYPE_DEPS) $(ARCHIVE)/$(FREETYPE_SOURCE) | $(TARGET_DIR)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
ifeq ($(BOXTYPE), armbox) LIBJPEG-TURBO = $(if $(filter $(BOXTYPE), coolstream), libjpeg-turbo, libjpeg-turbo2)
LIBJPEG-TURBO = libjpeg-turbo2
else
LIBJPEG-TURBO = libjpeg-turbo
endif
$(D)/libjpeg: $(LIBJPEG-TURBO) $(D)/libjpeg: $(LIBJPEG-TURBO)
$(TOUCH) $(TOUCH)
@ -377,11 +367,12 @@ $(ARCHIVE)/$(OPENSSL_SOURCE):
OPENSSL_PATCH = openssl-add-ni-specific-target.patch OPENSSL_PATCH = openssl-add-ni-specific-target.patch
OPENSSL_FLAGS = $(MAKE_OPTS) \ OPENSSL_MAKE_OPTS = \
AR="$(TARGET_AR) r" \ $(MAKE_OPTS) \
MAKEDEPPROG=$(TARGET_CC) \ AR="$(TARGET_AR) r" \
NI_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ MAKEDEPPROG=$(TARGET_CC) \
PROCESSOR=ARM NI_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
PROCESSOR=ARM
$(D)/openssl: $(ARCHIVE)/$(OPENSSL_SOURCE) | $(TARGET_DIR) $(D)/openssl: $(ARCHIVE)/$(OPENSSL_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(OPENSSL_TMP) $(REMOVE)/$(OPENSSL_TMP)
@ -402,9 +393,9 @@ $(D)/openssl: $(ARCHIVE)/$(OPENSSL_SOURCE) | $(TARGET_DIR)
--prefix=/ \ --prefix=/ \
--openssldir=$(remove-dir)/ssl \ --openssldir=$(remove-dir)/ssl \
; \ ; \
make $(OPENSSL_FLAGS) depend; \ make $(OPENSSL_MAKE_OPTS) depend; \
sed -i "s# build_tests##" Makefile; \ sed -i "s# build_tests##" Makefile; \
make $(OPENSSL_FLAGS) all; \ make $(OPENSSL_MAKE_OPTS) all; \
make install_sw INSTALL_PREFIX=$(TARGET_DIR) make install_sw INSTALL_PREFIX=$(TARGET_DIR)
$(REWRITE_PKGCONF)/openssl.pc $(REWRITE_PKGCONF)/openssl.pc
$(REWRITE_PKGCONF)/libcrypto.pc $(REWRITE_PKGCONF)/libcrypto.pc
@ -1210,10 +1201,7 @@ $(ARCHIVE)/$(LIBFFI_SOURCE):
LIBFFI_PATCH = libffi-install_headers.patch LIBFFI_PATCH = libffi-install_headers.patch
LIBFFI_CONF = $(EMPTY) LIBFFI_CONF = $(if $(filter $(BOXSERIES), hd1), --enable-static --disable-shared)
ifeq ($(BOXSERIES), hd1)
LIBFFI_CONF = --enable-static --disable-shared
endif
$(D)/libffi: $(ARCHIVE)/$(LIBFFI_SOURCE) | $(TARGET_DIR) $(D)/libffi: $(ARCHIVE)/$(LIBFFI_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(LIBFFI_TMP) $(REMOVE)/$(LIBFFI_TMP)
@ -1250,10 +1238,7 @@ ifeq ($(BOXSERIES), hd2)
GLIB2_DEPS += $(D)/gettext GLIB2_DEPS += $(D)/gettext
endif endif
GLIB2_CONF = $(EMPTY) GLIB2_CONF = $(if $(filter $(BOXSERIES), hd1), --enable-static --disable-shared)
ifeq ($(BOXSERIES), hd1)
GLIB2_CONF = --enable-static --disable-shared
endif
$(D)/glib2: $(GLIB2_DEPS) $(ARCHIVE)/$(GLIB2_SOURCE) | $(TARGET_DIR) $(D)/glib2: $(GLIB2_DEPS) $(ARCHIVE)/$(GLIB2_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(GLIB2_TMP) $(REMOVE)/$(GLIB2_TMP)

39
make/target-tools.mk
View File

@ -194,11 +194,7 @@ TZDATA_ZONELIST = \
africa antarctica asia australasia europe northamerica \ africa antarctica asia australasia europe northamerica \
southamerica pacificnew etcetera backward southamerica pacificnew etcetera backward
ifeq ($(BOXSERIES), hd2) ETC_LOCALTIME = $(if $(filter $(BOXSERIES), hd2),/var/etc/localtime,/etc/localtime)
LOCALTIME = var/etc/localtime
else
LOCALTIME = etc/localtime
endif
$(D)/tzdata: $(TZDATA_DEPS) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR) $(D)/tzdata: $(TZDATA_DEPS) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(TZDATA_TMP) $(REMOVE)/$(TZDATA_TMP)
@ -217,9 +213,10 @@ $(D)/tzdata: $(TZDATA_DEPS) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR)
test -e zoneinfo/$$x || echo "WARNING: timezone $$x not found."; \ test -e zoneinfo/$$x || echo "WARNING: timezone $$x not found."; \
done; \ done; \
mkdir -p $(TARGET_SHARE_DIR); \ mkdir -p $(TARGET_SHARE_DIR); \
rm -rf $(TARGET_SHARE_DIR)/zoneinfo; \
mv zoneinfo/ $(TARGET_SHARE_DIR)/ mv zoneinfo/ $(TARGET_SHARE_DIR)/
$(INSTALL_DATA) -D $(IMAGEFILES)/tzdata/timezone.xml $(TARGET_DIR)/etc/timezone.xml $(INSTALL_DATA) -D $(IMAGEFILES)/tzdata/timezone.xml $(TARGET_DIR)/etc/timezone.xml
$(INSTALL_DATA) $(TARGET_SHARE_DIR)/zoneinfo/CET $(TARGET_DIR)/$(LOCALTIME) $(INSTALL_DATA) $(TARGET_SHARE_DIR)/zoneinfo/CET $(TARGET_DIR)$(ETC_LOCALTIME)
$(REMOVE)/$(TZDATA_TMP) $(REMOVE)/$(TZDATA_TMP)
$(TOUCH) $(TOUCH)
@ -658,10 +655,10 @@ $(ARCHIVE)/$(PROCPS-NG_SOURCE):
PROCPS-NG_PATCH = procps-ng-0001-Fix-out-of-tree-builds.patch PROCPS-NG_PATCH = procps-ng-0001-Fix-out-of-tree-builds.patch
PROCPS-NG_PATCH += procps-ng-no-tests-docs.patch PROCPS-NG_PATCH += procps-ng-no-tests-docs.patch
PROCPS-NG_BIN = ps top
PROCPS-NG_DEPS = $(D)/ncurses PROCPS-NG_DEPS = $(D)/ncurses
PROCPS-NG_BIN = ps top
$(D)/procps-ng: $(PROCPS-NG_DEPS) $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR) $(D)/procps-ng: $(PROCPS-NG_DEPS) $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(PROCPS-NG_TMP) $(REMOVE)/$(PROCPS-NG_TMP)
$(UNTAR)/$(PROCPS-NG_SOURCE) $(UNTAR)/$(PROCPS-NG_SOURCE)
@ -676,6 +673,7 @@ $(D)/procps-ng: $(PROCPS-NG_DEPS) $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR)
--bindir=/bin.$(@F) \ --bindir=/bin.$(@F) \
--sbindir=/sbin.$(@F) \ --sbindir=/sbin.$(@F) \
--datarootdir=$(remove-datarootdir) \ --datarootdir=$(remove-datarootdir) \
--without-systemd \
; \ ; \
$(MAKE); \ $(MAKE); \
$(MAKE) install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
@ -780,11 +778,8 @@ $(D)/bash: $(ARCHIVE)/$(BASH_SOURCE) | $(TARGET_DIR)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
E2FSPROGS_VER = 1.44.5 # for coolstream: formatting ext4 failes with newer versions then 1.43.8
ifeq ($(BOXTYPE), coolstream) E2FSPROGS_VER = $(if $(filter $(BOXTYPE), coolstream),1.43.8,1.44.5)
# formatting ext4 failes with newer versions
E2FSPROGS_VER = 1.43.8
endif
E2FSPROGS_TMP = e2fsprogs-$(E2FSPROGS_VER) E2FSPROGS_TMP = e2fsprogs-$(E2FSPROGS_VER)
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VER).tar.gz E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VER).tar.gz
E2FSPROGS_URL = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS_VER) E2FSPROGS_URL = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS_VER)
@ -919,12 +914,10 @@ $(D)/autofs: $(AUTOFS_DEPS) $(ARCHIVE)/$(AUTOFS_SOURCE) | $(TARGET_DIR)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
SAMBA_TARGET = samba36 SAMBA_TARGET = $(if $(filter $(BOXSERIES), hd1), samba33, samba36)
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1))
SAMBA_TARGET = samba33
endif
samba: $(SAMBA_TARGET) $(D)/samba: $(SAMBA_TARGET)
$(TOUCH)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -1258,7 +1251,7 @@ $(D)/wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE)
$(REMOVE)/$(WPA_SUPPLICANT_TMP) $(REMOVE)/$(WPA_SUPPLICANT_TMP)
$(UNTAR)/$(WPA_SUPPLICANT_SOURCE) $(UNTAR)/$(WPA_SUPPLICANT_SOURCE)
$(CHDIR)/$(WPA_SUPPLICANT_TMP)/wpa_supplicant; \ $(CHDIR)/$(WPA_SUPPLICANT_TMP)/wpa_supplicant; \
cp $(CONFIGS)/wpa_supplicant.config .config; \ $(INSTALL_DATA) $(CONFIGS)/wpa_supplicant.config .config; \
$(BUILD_ENV) \ $(BUILD_ENV) \
$(MAKE); \ $(MAKE); \
$(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=/sbin $(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=/sbin
@ -1354,10 +1347,7 @@ NFS-UTILS_PATCH += nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch
NFS-UTILS_DEPS = $(D)/rpcbind NFS-UTILS_DEPS = $(D)/rpcbind
NFS-UTILS_IPV6 = --enable-ipv6 NFS-UTILS_CONF = $(if $(filter $(BOXSERIES), hd1), --disable-ipv6, --enable-ipv6)
ifeq ($(BOXSERIES), hd1)
NFS-UTILS_IPV6 = --disable-ipv6
endif
$(D)/nfs-utils: $(NFS-UTILS_DEPS) $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR) $(D)/nfs-utils: $(NFS-UTILS_DEPS) $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(NFS-UTILS_TMP) $(REMOVE)/$(NFS-UTILS_TMP)
@ -1376,7 +1366,7 @@ $(D)/nfs-utils: $(NFS-UTILS_DEPS) $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR)
--disable-nfsv41 \ --disable-nfsv41 \
--disable-gss \ --disable-gss \
--disable-uuid \ --disable-uuid \
$(NFS-UTILS_IPV6) \ $(NFS-UTILS_CONF) \
--without-tcp-wrappers \ --without-tcp-wrappers \
--with-statedir=/var/lib/nfs \ --with-statedir=/var/lib/nfs \
--with-rpcgen=internal \ --with-rpcgen=internal \
@ -1447,7 +1437,6 @@ FUSE-EXFAT_URL = https://github.com/relan/exfat/releases/download/v$(FUSE-EXF
$(ARCHIVE)/$(FUSE-EXFAT_SOURCE): $(ARCHIVE)/$(FUSE-EXFAT_SOURCE):
$(DOWNLOAD) $(FUSE-EXFAT_URL)/$(FUSE-EXFAT_SOURCE) $(DOWNLOAD) $(FUSE-EXFAT_URL)/$(FUSE-EXFAT_SOURCE)
FUSE-EXFAT_DEPS = $(D)/libfuse FUSE-EXFAT_DEPS = $(D)/libfuse
$(D)/fuse-exfat: $(FUSE-EXFAT_DEPS) $(ARCHIVE)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR) $(D)/fuse-exfat: $(FUSE-EXFAT_DEPS) $(ARCHIVE)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR)

Write Preview
Loading…
Cancel
Save