Skip to content

Commit 134f472

Browse files
Debian Qt/KDE Maintainerskkremitzki
authored andcommitted
update-patchelf
Update patchelf to current git version The current version fixes a bug which broke the ability to strip binaries with debug symbols: NixOS/patchelf#117 With the former version of patchelf, I would get "not enough room for program headers, try linking with -N" when trying to strip the binaries. This patch brings patchelf in sync with the commit 27ffe8ae871e7a186018d66020ef3f6162c12c69 of patchelf's git repository. Also update patchelf's build process to match the logic in upstream's automake files (thanks to Frédéric Bonnard for the patch to properly use getconf PAGESIZE). Bug: https://bugreports.qt.io/browse/PYSIDE-740 Last-Update: 2018-07-09 Gbp-Pq: Name update-patchelf.patch
1 parent 6d53589 commit 134f472

File tree

3 files changed

+1667
-504
lines changed

3 files changed

+1667
-504
lines changed

build_scripts/main.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -874,8 +874,14 @@ def build_patchelf(self):
874874
return
875875
log.info("Building patchelf...")
876876
module_src_dir = os.path.join(self.sources_dir, "patchelf")
877+
import subprocess
878+
pagesize = subprocess.check_output("getconf PAGESIZE", shell=True).decode('utf-8').rstrip()
877879
build_cmd = [
878880
"g++",
881+
"-std=c++11",
882+
"-DPAGESIZE=%s" % (pagesize),
883+
'-DPACKAGE_STRING="patchelf"',
884+
"-D_FILE_OFFSET_BITS=64",
879885
"{}/patchelf.cc".format(module_src_dir),
880886
"-o",
881887
"patchelf",

0 commit comments

Comments
 (0)