From 2c3d8d583ac7461e89c0790c41e57b243a6b468f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 2 Dec 2017 19:50:03 +0100 Subject: [PATCH] ccl: fix nopie. --- srcpkgs/ccl/patches/nopie.patch | 22 ++++++++++++++++++++++ srcpkgs/ccl/template | 7 +------ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/ccl/patches/nopie.patch diff --git a/srcpkgs/ccl/patches/nopie.patch b/srcpkgs/ccl/patches/nopie.patch new file mode 100644 index 00000000000..328ceb4364a --- /dev/null +++ b/srcpkgs/ccl/patches/nopie.patch @@ -0,0 +1,22 @@ +--- lisp-kernel/linuxx8664/Makefile.orig ++++ lisp-kernel/linuxx8664/Makefile +@@ -69,7 +69,7 @@ + all: ../../lx86cl64 + + +-OSLIBS = -ldl -lm -lpthread -lrt ++OSLIBS = -ldl -lm -lpthread -lrt -no-pie + LINK_MAP = ./elf_x86_64.x + USE_LINK_MAP = # -T ./elf_x86_64.x + +--- lisp-kernel/linuxx8632/Makefile.orig ++++ lisp-kernel/linuxx8632/Makefile +@@ -69,7 +69,7 @@ + all: ../../lx86cl + + +-OSLIBS = -ldl -lm -lpthread -lrt ++OSLIBS = -ldl -lm -lpthread -lrt -no-pie + LINK_SCRIPT = # ./elf_x86_32.x + USE_LINK_SCRIPT = # -T $(LINK_SCRIPT) + diff --git a/srcpkgs/ccl/template b/srcpkgs/ccl/template index 3796c7ef4c5..0c08b40243b 100644 --- a/srcpkgs/ccl/template +++ b/srcpkgs/ccl/template @@ -1,6 +1,6 @@ pkgname=ccl version=1.11.5 -revision=1 +revision=2 wrksrc="ccl" only_for_archs="i686 i686-musl x86_64 x86_64-musl" build_style=gnu-makefile @@ -15,11 +15,6 @@ nopie=1 nostrip=1 disable_parallel_build=1 -case "${XBPS_TARGET_MACHINE}" in - i686*) broken="https://build.voidlinux.eu/builders/i686_builder/builds/5997/steps/shell_3/logs/stdio";; - *-musl) broken="https://build.voidlinux.eu/builders/i686_builder/builds/5997/steps/shell_3/logs/stdio";; -esac - case $XBPS_MACHINE in x86_64*) _arch=64 ;; *) _arch='' ;;