diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2018-04-30 15:03:08 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2018-04-30 15:03:08 +0000 |
| commit | 165f89551c0a1b6254f607828d4046a4000f4170 (patch) | |
| tree | 3ac7d4e06eec8e9058f0507d35d3ea06be5e6c86 | |
| parent | 5d749446342f708d732e8f1350dbbd6c75fedd75 (diff) | |
| download | midipix_build-165f89551c0a1b6254f607828d4046a4000f4170.tar.bz2 midipix_build-165f89551c0a1b6254f607828d4046a4000f4170.tar.xz | |
vars/build.vars:native_packages_deps: adds zstd v1.3.4 as an optional dependency of rpm.
patches/zstd-1.3.4.local.patch: fix {zlib,{bzip2,lzma}} `detection.'
| -rw-r--r-- | patches/zstd-1.3.4.local.patch | 10 | ||||
| -rw-r--r-- | vars/build.vars | 17 |
2 files changed, 22 insertions, 5 deletions
diff --git a/patches/zstd-1.3.4.local.patch b/patches/zstd-1.3.4.local.patch new file mode 100644 index 00000000..10723d67 --- /dev/null +++ b/patches/zstd-1.3.4.local.patch @@ -0,0 +1,10 @@ +--- zstd-1.3.4/programs/Makefile.orig 2018-03-26 22:19:34.000000000 +0000 ++++ zstd-1.3.4/programs/Makefile 2018-04-30 14:55:39.468000000 +0000 +@@ -38,7 +38,6 @@ + CPPFLAGS+= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/compress \ + -I$(ZSTDDIR)/dictBuilder \ + -DXXH_NAMESPACE=ZSTD_ +-CFLAGS ?= -O3 + DEBUGFLAGS+=-Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ + -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \ + -Wstrict-prototypes -Wundef -Wpointer-arith -Wformat-security \ diff --git a/vars/build.vars b/vars/build.vars index bfa6e6b9..f0993ad0 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -343,11 +343,12 @@ NATIVE_PACKAGES_DEPS_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} - NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix="; NATIVE_PACKAGES_DEPS_PACKAGES=" -expat libxml2 alsa_lib apr apr_util bzip2 libdmtx libressl curl libz lmdb libpng -libjpeg_turbo tiff giflib libffi gdbm geoip pcre glib gzip libarchive -libatomic_ops musl_compat libbsd libpipeline libevent libfetch libogg libvorbis libgpg_error libassuan libfirm -libgcrypt libksba libudns lua ncurses ncursestw ncursesw libnettle gnutls libreadline npth -popt file rpm xz libsolv tdnf shared_mime_info sqlite3 w32api w32lib cmake qrencode util_linux"; +expat libxml2 alsa_lib apr apr_util bzip2 libdmtx libressl curl libz lmdb +libpng libjpeg_turbo tiff giflib libffi gdbm geoip pcre glib gzip libarchive +libatomic_ops musl_compat libbsd libpipeline libevent libfetch libogg libvorbis +libgpg_error libassuan libfirm libgcrypt libksba libudns lua ncurses ncursestw +ncursesw libnettle gnutls libreadline npth popt file zstd rpm xz libsolv tdnf +shared_mime_info sqlite3 w32api w32lib cmake qrencode util_linux"; NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}"; NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python"; : ${PKG_EXPAT_SHA256SUM:=d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff}; @@ -522,6 +523,12 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python"; : ${PKG_FILE_SHA256SUM:=8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50}; : ${PKG_FILE_VERSION:=5.32}; : ${PKG_FILE_URL:=ftp://ftp.astron.com/pub/file/file-${PKG_FILE_VERSION}.tar.gz}; +: ${PKG_ZSTD_SHA256SUM:=92e41b6e8dd26bbd46248e8aa1d86f1551bc221a796277ae9362954f26d605a9}; +: ${PKG_ZSTD_VERSION:=1.3.4}; +: ${PKG_ZSTD_URL:=https://github.com/facebook/zstd/archive/v${PKG_ZSTD_VERSION}.tar.gz}; +: ${PKG_ZSTD_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_DEPS_CFLAGS_CONFIGURE}}; +: ${PKG_ZSTD_IN_TREE:=1}; +: ${PKG_ZSTD_SUBDIR:=zstd-${PKG_ZSTD_VERSION}}; : ${PKG_RPM_SHA256SUM:=43f40e2ccc3ca65bd3238f8c9f8399d4957be0878c2e83cba2746d2d0d96793b}; : ${PKG_RPM_VERSION:=4.14.1}; : ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2}; |