diff --git a/package/gcc/9.3.0/0006-noPIC-picflagm4.patch b/package/gcc/9.3.0/0006-noPIC-picflagm4.patch new file mode 100644 index 00000000..b52088a0 --- /dev/null +++ b/package/gcc/9.3.0/0006-noPIC-picflagm4.patch @@ -0,0 +1,58 @@ +diff --git a/config/picflag.m4 b/config/picflag.m4 +--- a/config/picflag.m4 ++++ b/config/picflag.m4 +@@ -34,7 +22,7 @@ + i[[34567]]86-*-nto-qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. +- $1='-fPIC -shared' ++ $1='-fno-PIC' + ;; + i[[34567]]86-pc-msdosdjgpp*) + # DJGPP does not support shared libraries at all. +@@ -42,7 +30,7 @@ + ia64*-*-hpux*) + # On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. +- $1=-fPIC ++ $1=-fno-PIC + ;; + mips-sgi-irix6*) + # PIC is the default. +@@ -54,30 +42,30 @@ + # Some targets support both -fPIC and -fpic, but prefer the latter. + # FIXME: Why? + i[[34567]]86-*-* | x86_64-*-*) +- $1=-fpic ++ $1=-fno-PIC + ;; + # FIXME: Override -fPIC default in libgcc only? + sh-*-linux* | sh[[2346lbe]]*-*-linux*) +- $1=-fpic ++ $1=-fno-PIC + ;; + # FIXME: Simplify to sh*-*-netbsd*? + sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \ + sh64-*-netbsd* | sh64l*-*-netbsd*) +- $1=-fpic ++ $1=-fno-PIC + ;; + # Default to -fPIC unless specified otherwise. + *) +- $1=-fPIC ++ $1=-fno-PIC + ;; + esac + + # If the user explicitly uses -fpic/-fPIC, keep that. + case "${m4_bpatsubsts($1, PICFLAG, CFLAGS)}" in + *-fpic*) +- $1=-fpic ++ $1=-fno-PIC + ;; + *-fPIC*) +- $1=-fPIC ++ $1=-fno-PIC + ;; + esac + ]) diff --git a/package/gcc/9.3.0/Disable-fPIC-libgcc-Makefile.patch b/package/gcc/9.3.0/Disable-fPIC-libgcc-Makefile.patch new file mode 100644 index 00000000..8743180f --- /dev/null +++ b/package/gcc/9.3.0/Disable-fPIC-libgcc-Makefile.patch @@ -0,0 +1,11 @@ +--- a/libgcc/Makefile.in ++++ n/libgcc/Makefile.in +@@ -253,7 +253,7 @@ + # Additional target-dependent options for compiling libgcc2.a. + HOST_LIBGCC2_CFLAGS = + +-PICFLAG = @PICFLAG@ ++PICFLAG = + + CET_FLAGS = @CET_FLAGS@ + diff --git a/package/gcc/9.3.0/Force-NoPIC-libgcc-configfile.patch b/package/gcc/9.3.0/Force-NoPIC-libgcc-configfile.patch new file mode 100644 index 00000000..e4f5dae7 --- /dev/null +++ b/package/gcc/9.3.0/Force-NoPIC-libgcc-configfile.patch @@ -0,0 +1,6 @@ +--- a/libgcc/config/t-libgcc-pic ++++ b/libgcc/config/t-libgcc-pic +@@ -1,2 +1,2 @@ + # Compile libgcc2.a with pic. +-HOST_LIBGCC2_CFLAGS += $(PICFLAG) ++HOST_LIBGCC2_CFLAGS += diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 5a53b970..762db765 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -85,7 +85,7 @@ config BR2_GCC_VERSION default "5.5.0" if BR2_GCC_VERSION_5_X default "7.4.0" if BR2_GCC_VERSION_7_X default "8.3.0" if BR2_GCC_VERSION_8_X - default "9.2.0" if BR2_GCC_VERSION_9_X + default "9.3.0" if BR2_GCC_VERSION_9_X default "arc-2019.03-release" if BR2_GCC_VERSION_ARC default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 5be1ec1a..245404c8 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -5,7 +5,7 @@ sha512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6 # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.3.0/sha512.sum sha512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802 gcc-8.3.0.tar.xz # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-9.2.0/sha512.sum -sha512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040 gcc-9.2.0.tar.xz +sha512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de gcc-9.3.0.tar.xz # Locally calculated (fetched from Github) sha512 c3f63fb601140f92d2dbef96b2dcc025ef754d2f049bfcc3d33e746c7b218b5138f2d8768cd580134858a8d347d234cf3ead276638f6de409f8f07c986e136b6 gcc-arc-2019.03-release.tar.gz diff --git a/package/libmikmod/Config.in b/package/libmikmod/Config.in index 909cc003..af2d6618 100644 --- a/package/libmikmod/Config.in +++ b/package/libmikmod/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBMIKMOD bool "libmikmod" + depends on BR2_PACKAGE_SDL help Mikmod is a module player and library supporting many tracker formats, including mod, s3m, it, and xm. diff --git a/package/libmikmod/libmikmod.mk b/package/libmikmod/libmikmod.mk index d4b79e04..79d6d581 100644 --- a/package/libmikmod/libmikmod.mk +++ b/package/libmikmod/libmikmod.mk @@ -18,4 +18,7 @@ rm -f $(TARGET_DIR)/usr/bin/libmikmod-config endef LIBMIKMOD_POST_INSTALL_TARGET_HOOKS += LIBMIKMOD_REMOVE_LIBMIKMOD_CONFIG +LIBMIKMOD_CONF_OPTS += --enable-sdl --enable-sdl2=no --enable-shared=no --with-sdl-prefix=$(STAGING_DIR)/usr +LIBMIKMOD_DEPENDENCIES += sdl + $(eval $(autotools-package)) diff --git a/package/musl/musl.hash b/package/musl/musl.hash index 2e5c1c0a..92fa8523 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from # http://www.musl-libc.org/releases/musl-1.1.23.tar.gz.asc -sha256 8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa musl-1.1.23.tar.gz +sha256 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 musl-1.1.24.tar.gz sha256 b349949ea277c203212aa85b42cdc5310527419e6fa0ce29fef7641abe194577 COPYRIGHT diff --git a/package/musl/musl.mk b/package/musl/musl.mk index b401fb3d..df68c5f5 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.1.23 +MUSL_VERSION = 1.1.24 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT