diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/aarch64-linux-gnu-gcc/PKGBUILD | 92 | ||||
-rw-r--r-- | libre/linux-libre-firmware/PKGBUILD | 30 | ||||
-rw-r--r-- | libre/linux-libre-firmware/config | 2 | ||||
-rw-r--r-- | libre/linux-libre-firmware/remove-wget.patch | 32 |
4 files changed, 52 insertions, 104 deletions
diff --git a/libre/aarch64-linux-gnu-gcc/PKGBUILD b/libre/aarch64-linux-gnu-gcc/PKGBUILD deleted file mode 100644 index 60c10c9c3..000000000 --- a/libre/aarch64-linux-gnu-gcc/PKGBUILD +++ /dev/null @@ -1,92 +0,0 @@ -# Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com> - -_target=aarch64-linux-gnu -pkgname=$_target-gcc -pkgver=7.2.0 -_islver=0.18 -pkgrel=1 -_snapshot=7-20170907 -pkgdesc='The GNU Compiler Collection - cross compiler for ARM64 target' -arch=(i686 x86_64) -url='http://gcc.gnu.org/' -license=(GPL LGPL FDL) -depends=($_target-binutils $_target-glibc libmpc zlib) -makedepends=(gmp mpfr) -options=(!emptydirs !strip) -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.xz - http://isl.gforge.inria.fr/isl-$_islver.tar.bz2) -sha256sums=('af37950ac7fc4996b4bdf22cbaaf5d1db52ff6490bfe3d83bcae5d5097645bc9' - '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b') - -if [ -n "$_snapshot" ]; then - _basedir=gcc-$_snapshot -else - _basedir=gcc-$pkgver -fi - -prepare() { - cd $_basedir - - # link isl for in-tree builds - ln -sf ../isl-$_islver isl - - echo $pkgver > gcc/BASE-VER - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - # hack! - some configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure - - rm -rf $srcdir/gcc-build - mkdir $srcdir/gcc-build -} - -build() { - cd gcc-build - - # using -pipe causes spurious test-suite failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 - CFLAGS=${CFLAGS/-pipe/} - CXXFLAGS=${CXXFLAGS/-pipe/} - - $srcdir/$_basedir/configure \ - --prefix=/usr \ - --program-prefix=$_target- \ - --with-local-prefix=/usr/$_target \ - --with-sysroot=/usr/$_target \ - --with-build-sysroot=/usr/$_target \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --target=$_target --host=$CHOST --build=$CHOST \ - --disable-nls \ - --enable-languages=c,c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --with-isl --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --disable-libstdcxx-pch --disable-libssp \ - --enable-gnu-unique-object --enable-linker-build-id \ - --enable-lto --enable-plugin --enable-install-libiberty \ - --with-linker-hash-style=gnu --enable-gnu-indirect-function \ - --disable-multilib --disable-werror \ - --enable-checking=release - - make -} - -package() { - cd gcc-build - - make DESTDIR="$pkgdir" install-gcc install-target-libgcc install-target-libstdc++-v3 - - # strip target binaries - find "$pkgdir"/usr/lib/gcc/$_target/ "$pkgdir"/usr/$_target/lib -type f -and \( -name \*.a -or -name \*.o \) -exec $_target-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc '{}' \; - - # strip host binaries - find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc/$_target/ -type f -and \( -executable \) -exec strip '{}' \; - - # Remove files that conflict with host gcc package - rm -r "$pkgdir"/usr/share/man/man7 - rm -r "$pkgdir"/usr/share/info - rm -r "$pkgdir"/usr/share/gcc-$pkgver -} diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index c7712415b..a2d78c816 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -5,14 +5,14 @@ pkgname=linux-libre-firmware pkgver=1.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Firmware files for Linux-libre' arch=('any') url='https://jxself.org/firmware' -license=('GPL3' 'GPL2' 'MPL' 'BSD3') +license=('GPL3' 'GPL2' 'MPL') depends=('ath9k-htc-firmware') -makedepends=('cmake' 'gmp' 'gperf' 'arm-linux-gnueabi-gcc') +makedepends=('cmake' 'gmp' 'gperf' 'arm-linux-gnueabi-gcc' 'sh-elf-gcc' 'sh-elf-newlib' 'xtensa-unknown-elf-gcc') provides=('linux-firmware') conflicts=('linux-firmware' 'linux-firmware-git' @@ -30,30 +30,38 @@ conflicts=('linux-firmware' 'amd-ucode' 'openfwwf') replaces=(${conflicts[@]}) +options=(!strip) source=("${url}/${pkgname}-${pkgver}.tar.lz"{,.asc} - 'remove-wget.patch' - 'config' # carl9170fw configuration + 'remove-wget.patch' # remove the download of external toolchains + 'config' # carl9170fw configuration ) sha512sums=('4ef111f86e8a87bab31e02be171e09f47d71884f1737f5329e9dd07e9f799436d8ff2de5aa0b2cfb4bc921ed02bb2b59b9a1ea69176dcef5f902364d8725e75a' 'SKIP' - 'b6579a0de9e66dcbeec350172764ebedc06a6056fc3592a040f6447d1806f29d82b8bdc36e33b6012aae2068dc6975e70e0c0d1381c84937317bc763c6f2290f' - '087371c69a8ba394822efa1a41f45ec8f2a7800bcfa63a9e0e492eceaa75b85b6ea5a534e7a37091199d72229c12fe44dc0ad34625ff1c4a09c3725bc09331a3') + 'ed4af53a48efd512809a490f9f558fc94f71950b847547bbec175c3bf805fa2bf7c6fea6cec77f454e37d4650b6339c384f5458b979221490921935bd7c044d1' + '4e596db89f88ed24db3eaff8ed2853d2a07128ba430a26bc63e08f29e4cd4c7093d358df35f580ede563103f0cf720f0f81f517108c79e80d8cf2aee786023f4') validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self prepare() { cd $srcdir/$pkgname-$pkgver - # Some firmwares download compilers with wget. We don't want that + # Some firmwares download toolchains with wget. We don't want that patch -p1 -i ../remove-wget.patch # Although we still don't use carl9170fw yet, this is a step forward - cp ../config src/carl9170fw/.config - sed '13s|config/conf|config/conf --config|' -i src/carl9170fw/autogen.sh + cp -Tf ../config src/carl9170fw/.config + sed -e '13s|config/conf|config/conf --config|' \ + -i src/carl9170fw/autogen.sh } build() { cd "${srcdir}/${pkgname}-${pkgver}/src" - make cis isci keyspan_pda openfwwf av7110 dsp56k # usbdux carl9170fw ath9k_htc + make ath9k_htc + + # NOTE: usbdux will only build in 32-bits systems/chroots (i686 and armv7h for instance), + # however compiling it manually (without makepkg) on a 64-bits machine works. + # Building with makepkg in a 64-bits system or chroot ends into a segmentation fault. + # Source: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=887320 +# make cis isci keyspan_pda openfwwf av7110 dsp56k usbdux carl9170fw # ath9k_htc } package() { diff --git a/libre/linux-libre-firmware/config b/libre/linux-libre-firmware/config index 278abc9a1..3b53f7989 100644 --- a/libre/linux-libre-firmware/config +++ b/libre/linux-libre-firmware/config @@ -49,4 +49,4 @@ CONFIG_CARL9170FW_BUILD_MINIBOOT=y # # Firmware Tools # -CONFIG_CARL9170FW_BUILD_TOOLS=y +# CONFIG_CARL9170FW_BUILD_TOOLS is not set diff --git a/libre/linux-libre-firmware/remove-wget.patch b/libre/linux-libre-firmware/remove-wget.patch index 30c9e8a7d..59142b786 100644 --- a/libre/linux-libre-firmware/remove-wget.patch +++ b/libre/linux-libre-firmware/remove-wget.patch @@ -29409,6 +29409,38 @@ index e2d4639..4d0de5c 100755 TOOLCHAIN_FILE="$PWD/build/toolchain.cmake" +diff --git a/src/carl9170fw/extra/sh-elf-linux.cmake b/src/carl9170fw/extra/sh-elf-linux.cmake +index 3fdf98c..36e3b63 100644 +--- a/src/carl9170fw/extra/sh-elf-linux.cmake ++++ b/src/carl9170fw/extra/sh-elf-linux.cmake +@@ -3,19 +3,19 @@ set(CMAKE_SYSTEM_PROCESSOR "sh2") + + set_property(DIRECTORY PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE) + +-set(CMAKE_FIND_ROOT_PATH ${CMAKE_SOURCE_DIR}/toolchain/inst/) ++set(CMAKE_FIND_ROOT_PATH /) + + set(CMAKE_C_FLAGS "-m2 -ml -Os -ffreestanding -nostartfiles") + set(CMAKE_C_LINK_FLAGS "-Wl,-static,-EL,-x,--gc-sections") + set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") + +-set(OBJCOPY ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-objcopy) +-set(CMAKE_C_COMPILER "${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-gcc") +-set(CMAKE_AR ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-ar) +-set(CMAKE_ASM_COMPILER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-as) +-set(CMAKE_ASM-ATT_COMPILER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-as) +-set(CMAKE_LINKER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-ld) +-set(CMAKE_C_LINK_EXECUTABLE "${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-gcc <OBJECTS> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> -o <TARGET>") ++set(OBJCOPY /bin/sh-elf-objcopy) ++set(CMAKE_C_COMPILER "/bin/sh-elf-gcc") ++set(CMAKE_AR /bin/sh-elf-ar) ++set(CMAKE_ASM_COMPILER /bin/sh-elf-as) ++set(CMAKE_ASM-ATT_COMPILER /bin/sh-elf-as) ++set(CMAKE_LINKER /bin/sh-elf-ld) ++set(CMAKE_C_LINK_EXECUTABLE "/bin/sh-elf-gcc <OBJECTS> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> -o <TARGET>") + + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) diff --git a/src/carl9170fw/toolchain/Makefile a/src/carl9170fw/toolchain/Makefile deleted file mode 100644 index 3ee93a9..0000000 |