* [PATCH] binutils: update to 2.34
@ 2020-03-07 10:36 Peter Müller
2020-03-08 11:37 ` Michael Tremer
2020-03-20 13:37 ` [PATCH v2 1/2] cairo: Update to 1.16.0 Michael Tremer
0 siblings, 2 replies; 5+ messages in thread
From: Peter Müller @ 2020-03-07 10:36 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4334 bytes --]
Due to missing build hardware for ARMv5 and ARM64 architecture, this patch
updates the rootfiles for i586 and x86_64 only. I would like to ask
somebody capable of the missing architectures to do the corresponding
rootfile updates for me. Thank you.
Cc: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
config/rootfiles/common/i586/binutils | 17 +++++++++++++++--
config/rootfiles/common/x86_64/binutils | 17 +++++++++++++++--
lfs/binutils | 6 +++---
3 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/config/rootfiles/common/i586/binutils b/config/rootfiles/common/i586/binutils
index 2d4f12a33..4e2014d02 100644
--- a/config/rootfiles/common/i586/binutils
+++ b/config/rootfiles/common/i586/binutils
@@ -18,11 +18,24 @@ usr/bin/strings
#usr/include/bfd.h
#usr/include/bfd_stdint.h
#usr/include/bfdlink.h
+#usr/include/ctf-api.h
+#usr/include/ctf.h
#usr/include/diagnostics.h
#usr/include/dis-asm.h
#usr/include/libiberty.h
#usr/include/plugin-api.h
#usr/include/symcat.h
+#usr/lib/libbfd-2.34.so
+#usr/lib/libctf-nobfd.a
+#usr/lib/libctf-nobfd.la
+#usr/lib/libctf-nobfd.so
+#usr/lib/libctf-nobfd.so.0
+#usr/lib/libctf-nobfd.so.0.0.0
+#usr/lib/libctf.a
+#usr/lib/libctf.la
+#usr/lib/libctf.so
+#usr/lib/libctf.so.0
+#usr/lib/libctf.so.0.0.0
#usr/lib/ldscripts
#usr/lib/ldscripts/elf32_x86_64.x
#usr/lib/ldscripts/elf32_x86_64.xbn
@@ -156,11 +169,11 @@ usr/bin/strings
#usr/lib/ldscripts/elf_x86_64.xu
#usr/lib/ldscripts/elf_x86_64.xw
#usr/lib/ldscripts/elf_x86_64.xwe
-usr/lib/libbfd-2.32.so
+usr/lib/libbfd-2.34.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
-usr/lib/libopcodes-2.32.so
+usr/lib/libopcodes-2.34.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils
index 2d4f12a33..4e2014d02 100644
--- a/config/rootfiles/common/x86_64/binutils
+++ b/config/rootfiles/common/x86_64/binutils
@@ -18,11 +18,24 @@ usr/bin/strings
#usr/include/bfd.h
#usr/include/bfd_stdint.h
#usr/include/bfdlink.h
+#usr/include/ctf-api.h
+#usr/include/ctf.h
#usr/include/diagnostics.h
#usr/include/dis-asm.h
#usr/include/libiberty.h
#usr/include/plugin-api.h
#usr/include/symcat.h
+#usr/lib/libbfd-2.34.so
+#usr/lib/libctf-nobfd.a
+#usr/lib/libctf-nobfd.la
+#usr/lib/libctf-nobfd.so
+#usr/lib/libctf-nobfd.so.0
+#usr/lib/libctf-nobfd.so.0.0.0
+#usr/lib/libctf.a
+#usr/lib/libctf.la
+#usr/lib/libctf.so
+#usr/lib/libctf.so.0
+#usr/lib/libctf.so.0.0.0
#usr/lib/ldscripts
#usr/lib/ldscripts/elf32_x86_64.x
#usr/lib/ldscripts/elf32_x86_64.xbn
@@ -156,11 +169,11 @@ usr/bin/strings
#usr/lib/ldscripts/elf_x86_64.xu
#usr/lib/ldscripts/elf_x86_64.xw
#usr/lib/ldscripts/elf_x86_64.xwe
-usr/lib/libbfd-2.32.so
+usr/lib/libbfd-2.34.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
-usr/lib/libopcodes-2.32.so
+usr/lib/libopcodes-2.34.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
diff --git a/lfs/binutils b/lfs/binutils
index 7df005146..334adad25 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 2.32
+VER = 2.34
THISAPP = binutils-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -94,7 +94,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0d174cdaf85721c5723bf52355be41e6
+$(DL_FILE)_MD5 = 664ec3a2df7805ed3464639aaae332d6
install : $(TARGET)
--
2.16.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] binutils: update to 2.34
2020-03-07 10:36 [PATCH] binutils: update to 2.34 Peter Müller
@ 2020-03-08 11:37 ` Michael Tremer
2020-03-20 13:37 ` [PATCH v2 1/2] cairo: Update to 1.16.0 Michael Tremer
1 sibling, 0 replies; 5+ messages in thread
From: Michael Tremer @ 2020-03-08 11:37 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4893 bytes --]
Hello,
First of all, it sounds like this patch is breaking the build:
https://lists.ipfire.org/pipermail/development/2020-March/007159.html
Secondly, you can log in to any of the ARM builders, check out the source somewhere and build it on there.
-Michael
> On 7 Mar 2020, at 10:36, Peter Müller <peter.mueller(a)ipfire.org> wrote:
>
> Due to missing build hardware for ARMv5 and ARM64 architecture, this patch
> updates the rootfiles for i586 and x86_64 only. I would like to ask
> somebody capable of the missing architectures to do the corresponding
> rootfile updates for me. Thank you.
>
> Cc: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> config/rootfiles/common/i586/binutils | 17 +++++++++++++++--
> config/rootfiles/common/x86_64/binutils | 17 +++++++++++++++--
> lfs/binutils | 6 +++---
> 3 files changed, 33 insertions(+), 7 deletions(-)
>
> diff --git a/config/rootfiles/common/i586/binutils b/config/rootfiles/common/i586/binutils
> index 2d4f12a33..4e2014d02 100644
> --- a/config/rootfiles/common/i586/binutils
> +++ b/config/rootfiles/common/i586/binutils
> @@ -18,11 +18,24 @@ usr/bin/strings
> #usr/include/bfd.h
> #usr/include/bfd_stdint.h
> #usr/include/bfdlink.h
> +#usr/include/ctf-api.h
> +#usr/include/ctf.h
> #usr/include/diagnostics.h
> #usr/include/dis-asm.h
> #usr/include/libiberty.h
> #usr/include/plugin-api.h
> #usr/include/symcat.h
> +#usr/lib/libbfd-2.34.so
> +#usr/lib/libctf-nobfd.a
> +#usr/lib/libctf-nobfd.la
> +#usr/lib/libctf-nobfd.so
> +#usr/lib/libctf-nobfd.so.0
> +#usr/lib/libctf-nobfd.so.0.0.0
> +#usr/lib/libctf.a
> +#usr/lib/libctf.la
> +#usr/lib/libctf.so
> +#usr/lib/libctf.so.0
> +#usr/lib/libctf.so.0.0.0
> #usr/lib/ldscripts
> #usr/lib/ldscripts/elf32_x86_64.x
> #usr/lib/ldscripts/elf32_x86_64.xbn
> @@ -156,11 +169,11 @@ usr/bin/strings
> #usr/lib/ldscripts/elf_x86_64.xu
> #usr/lib/ldscripts/elf_x86_64.xw
> #usr/lib/ldscripts/elf_x86_64.xwe
> -usr/lib/libbfd-2.32.so
> +usr/lib/libbfd-2.34.so
> #usr/lib/libbfd.a
> #usr/lib/libbfd.la
> #usr/lib/libbfd.so
> -usr/lib/libopcodes-2.32.so
> +usr/lib/libopcodes-2.34.so
> #usr/lib/libopcodes.a
> #usr/lib/libopcodes.la
> #usr/lib/libopcodes.so
> diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils
> index 2d4f12a33..4e2014d02 100644
> --- a/config/rootfiles/common/x86_64/binutils
> +++ b/config/rootfiles/common/x86_64/binutils
> @@ -18,11 +18,24 @@ usr/bin/strings
> #usr/include/bfd.h
> #usr/include/bfd_stdint.h
> #usr/include/bfdlink.h
> +#usr/include/ctf-api.h
> +#usr/include/ctf.h
> #usr/include/diagnostics.h
> #usr/include/dis-asm.h
> #usr/include/libiberty.h
> #usr/include/plugin-api.h
> #usr/include/symcat.h
> +#usr/lib/libbfd-2.34.so
> +#usr/lib/libctf-nobfd.a
> +#usr/lib/libctf-nobfd.la
> +#usr/lib/libctf-nobfd.so
> +#usr/lib/libctf-nobfd.so.0
> +#usr/lib/libctf-nobfd.so.0.0.0
> +#usr/lib/libctf.a
> +#usr/lib/libctf.la
> +#usr/lib/libctf.so
> +#usr/lib/libctf.so.0
> +#usr/lib/libctf.so.0.0.0
> #usr/lib/ldscripts
> #usr/lib/ldscripts/elf32_x86_64.x
> #usr/lib/ldscripts/elf32_x86_64.xbn
> @@ -156,11 +169,11 @@ usr/bin/strings
> #usr/lib/ldscripts/elf_x86_64.xu
> #usr/lib/ldscripts/elf_x86_64.xw
> #usr/lib/ldscripts/elf_x86_64.xwe
> -usr/lib/libbfd-2.32.so
> +usr/lib/libbfd-2.34.so
> #usr/lib/libbfd.a
> #usr/lib/libbfd.la
> #usr/lib/libbfd.so
> -usr/lib/libopcodes-2.32.so
> +usr/lib/libopcodes-2.34.so
> #usr/lib/libopcodes.a
> #usr/lib/libopcodes.la
> #usr/lib/libopcodes.so
> diff --git a/lfs/binutils b/lfs/binutils
> index 7df005146..334adad25 100644
> --- a/lfs/binutils
> +++ b/lfs/binutils
> @@ -1,7 +1,7 @@
> ###############################################################################
> # #
> # IPFire.org - A linux based firewall #
> -# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> #
> +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
> # #
> # This program is free software: you can redistribute it and/or modify #
> # it under the terms of the GNU General Public License as published by #
> @@ -24,7 +24,7 @@
>
> include Config
>
> -VER = 2.32
> +VER = 2.34
>
> THISAPP = binutils-$(VER)
> DL_FILE = $(THISAPP).tar.xz
> @@ -94,7 +94,7 @@ objects = $(DL_FILE)
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>
> -$(DL_FILE)_MD5 = 0d174cdaf85721c5723bf52355be41e6
> +$(DL_FILE)_MD5 = 664ec3a2df7805ed3464639aaae332d6
>
> install : $(TARGET)
>
> --
> 2.16.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] cairo: Update to 1.16.0
2020-03-07 10:36 [PATCH] binutils: update to 2.34 Peter Müller
2020-03-08 11:37 ` Michael Tremer
@ 2020-03-20 13:37 ` Michael Tremer
2020-03-20 13:37 ` [PATCH v2 2/2] binutils: update to 2.34 Michael Tremer
2020-03-20 17:21 ` [PATCH v2 1/2] cairo: Update to 1.16.0 Peter Müller
1 sibling, 2 replies; 5+ messages in thread
From: Michael Tremer @ 2020-03-20 13:37 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4500 bytes --]
This updates the package and adds a patch so that it compiles
with binutils 2.34.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/cairo | 11 +++++------
lfs/cairo | 5 +++--
src/patches/cairo-1.16.0-binutils-2.34.patch | 20 ++++++++++++++++++++
3 files changed, 28 insertions(+), 8 deletions(-)
create mode 100644 src/patches/cairo-1.16.0-binutils-2.34.patch
diff --git a/config/rootfiles/common/cairo b/config/rootfiles/common/cairo
index 12934cead..7cbb434d1 100644
--- a/config/rootfiles/common/cairo
+++ b/config/rootfiles/common/cairo
@@ -15,23 +15,21 @@
#usr/lib/cairo/libcairo-trace.a
#usr/lib/cairo/libcairo-trace.la
#usr/lib/cairo/libcairo-trace.so
-usr/lib/cairo/libcairo-trace.so.0
-usr/lib/cairo/libcairo-trace.so.0.0.0
#usr/lib/libcairo-gobject.a
#usr/lib/libcairo-gobject.la
#usr/lib/libcairo-gobject.so
usr/lib/libcairo-gobject.so.2
-usr/lib/libcairo-gobject.so.2.11400.8
+usr/lib/libcairo-gobject.so.2.11600.0
#usr/lib/libcairo-script-interpreter.a
#usr/lib/libcairo-script-interpreter.la
#usr/lib/libcairo-script-interpreter.so
usr/lib/libcairo-script-interpreter.so.2
-usr/lib/libcairo-script-interpreter.so.2.11400.8
+usr/lib/libcairo-script-interpreter.so.2.11600.0
#usr/lib/libcairo.a
#usr/lib/libcairo.la
#usr/lib/libcairo.so
usr/lib/libcairo.so.2
-usr/lib/libcairo.so.2.11400.8
+usr/lib/libcairo.so.2.11600.0
#usr/lib/pkgconfig/cairo-fc.pc
#usr/lib/pkgconfig/cairo-ft.pc
#usr/lib/pkgconfig/cairo-gobject.pc
@@ -65,6 +63,7 @@ usr/lib/libcairo.so.2.11400.8
#usr/share/gtk-doc/html/cairo/cairo-Regions.html
#usr/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
#usr/share/gtk-doc/html/cairo/cairo-Script-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-Tags-and-Links.html
#usr/share/gtk-doc/html/cairo/cairo-Transformations.html
#usr/share/gtk-doc/html/cairo/cairo-Types.html
#usr/share/gtk-doc/html/cairo/cairo-User-Fonts.html
@@ -92,13 +91,13 @@ usr/lib/libcairo.so.2.11400.8
#usr/share/gtk-doc/html/cairo/index-1.10.html
#usr/share/gtk-doc/html/cairo/index-1.12.html
#usr/share/gtk-doc/html/cairo/index-1.14.html
+#usr/share/gtk-doc/html/cairo/index-1.16.html
#usr/share/gtk-doc/html/cairo/index-1.2.html
#usr/share/gtk-doc/html/cairo/index-1.4.html
#usr/share/gtk-doc/html/cairo/index-1.6.html
#usr/share/gtk-doc/html/cairo/index-1.8.html
#usr/share/gtk-doc/html/cairo/index-all.html
#usr/share/gtk-doc/html/cairo/index.html
-#usr/share/gtk-doc/html/cairo/index.sgml
#usr/share/gtk-doc/html/cairo/language-bindings.html
#usr/share/gtk-doc/html/cairo/left-insensitive.png
#usr/share/gtk-doc/html/cairo/left.png
diff --git a/lfs/cairo b/lfs/cairo
index 0d28b5405..082cc4edd 100644
--- a/lfs/cairo
+++ b/lfs/cairo
@@ -24,7 +24,7 @@
include Config
-VER = 1.14.8
+VER = 1.16.0
THISAPP = cairo-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4ef0db2eacb271c74f8a3fd87822aa98
+$(DL_FILE)_MD5 = f19e0353828269c22bd72e271243a552
install : $(TARGET)
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cairo-1.16.0-binutils-2.34.patch
cd $(DIR_APP) && ./configure --prefix=/usr \
--disable-win32 --disable-os2 --disable-beos
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/src/patches/cairo-1.16.0-binutils-2.34.patch b/src/patches/cairo-1.16.0-binutils-2.34.patch
new file mode 100644
index 000000000..03daac0ec
--- /dev/null
+++ b/src/patches/cairo-1.16.0-binutils-2.34.patch
@@ -0,0 +1,20 @@
+--- a/util/cairo-trace/lookup-symbol.c
++++ b/util/cairo-trace/lookup-symbol.c
+@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
+ if (symbol->found)
+ return;
+
+- if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0)
++ if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
+ return;
+
+- vma = bfd_get_section_vma (symtab->bfd, section);
++ vma = bfd_section_vma (section);
+ if (symbol->pc < vma)
+ return;
+
+- size = bfd_section_size (symtab->bfd, section);
++ size = bfd_section_size (section);
+ if (symbol->pc >= vma + size)
+ return;
+
--
2.20.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] binutils: update to 2.34
2020-03-20 13:37 ` [PATCH v2 1/2] cairo: Update to 1.16.0 Michael Tremer
@ 2020-03-20 13:37 ` Michael Tremer
2020-03-20 17:21 ` [PATCH v2 1/2] cairo: Update to 1.16.0 Peter Müller
1 sibling, 0 replies; 5+ messages in thread
From: Michael Tremer @ 2020-03-20 13:37 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6231 bytes --]
From: Peter Müller <peter.mueller(a)ipfire.org>
Cc: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/aarch64/binutils | 16 ++++++++++++++--
config/rootfiles/common/armv5tel/binutils | 16 ++++++++++++++--
config/rootfiles/common/i586/binutils | 16 ++++++++++++++--
config/rootfiles/common/x86_64/binutils | 16 ++++++++++++++--
lfs/binutils | 6 +++---
5 files changed, 59 insertions(+), 11 deletions(-)
diff --git a/config/rootfiles/common/aarch64/binutils b/config/rootfiles/common/aarch64/binutils
index 3696ec829..27c089fba 100644
--- a/config/rootfiles/common/aarch64/binutils
+++ b/config/rootfiles/common/aarch64/binutils
@@ -18,6 +18,8 @@ usr/bin/strings
#usr/include/bfd.h
#usr/include/bfd_stdint.h
#usr/include/bfdlink.h
+#usr/include/ctf-api.h
+#usr/include/ctf.h
#usr/include/diagnostics.h
#usr/include/dis-asm.h
#usr/include/libiberty.h
@@ -288,11 +290,21 @@ usr/bin/strings
#usr/lib/ldscripts/armelfb_linux_eabi.xu
#usr/lib/ldscripts/armelfb_linux_eabi.xw
#usr/lib/ldscripts/armelfb_linux_eabi.xwe
-usr/lib/libbfd-2.32.so
+usr/lib/libbfd-2.34.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
-usr/lib/libopcodes-2.32.so
+#usr/lib/libctf-nobfd.a
+#usr/lib/libctf-nobfd.la
+#usr/lib/libctf-nobfd.so
+usr/lib/libctf-nobfd.so.0
+usr/lib/libctf-nobfd.so.0.0.0
+#usr/lib/libctf.a
+#usr/lib/libctf.la
+#usr/lib/libctf.so
+usr/lib/libctf.so.0
+usr/lib/libctf.so.0.0.0
+usr/lib/libopcodes-2.34.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
diff --git a/config/rootfiles/common/armv5tel/binutils b/config/rootfiles/common/armv5tel/binutils
index 6dee7972e..7c5707ebe 100644
--- a/config/rootfiles/common/armv5tel/binutils
+++ b/config/rootfiles/common/armv5tel/binutils
@@ -18,6 +18,8 @@ usr/bin/strings
#usr/include/bfd.h
#usr/include/bfd_stdint.h
#usr/include/bfdlink.h
+#usr/include/ctf-api.h
+#usr/include/ctf.h
#usr/include/diagnostics.h
#usr/include/dis-asm.h
#usr/include/libiberty.h
@@ -68,11 +70,21 @@ usr/bin/strings
#usr/lib/ldscripts/armelfb_linux_eabi.xu
#usr/lib/ldscripts/armelfb_linux_eabi.xw
#usr/lib/ldscripts/armelfb_linux_eabi.xwe
-usr/lib/libbfd-2.32.so
+usr/lib/libbfd-2.34.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
-usr/lib/libopcodes-2.32.so
+#usr/lib/libctf-nobfd.a
+#usr/lib/libctf-nobfd.la
+#usr/lib/libctf-nobfd.so
+usr/lib/libctf-nobfd.so.0
+usr/lib/libctf-nobfd.so.0.0.0
+#usr/lib/libctf.a
+#usr/lib/libctf.la
+#usr/lib/libctf.so
+usr/lib/libctf.so.0
+usr/lib/libctf.so.0.0.0
+usr/lib/libopcodes-2.34.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
diff --git a/config/rootfiles/common/i586/binutils b/config/rootfiles/common/i586/binutils
index 2d4f12a33..16e682a44 100644
--- a/config/rootfiles/common/i586/binutils
+++ b/config/rootfiles/common/i586/binutils
@@ -18,6 +18,8 @@ usr/bin/strings
#usr/include/bfd.h
#usr/include/bfd_stdint.h
#usr/include/bfdlink.h
+#usr/include/ctf-api.h
+#usr/include/ctf.h
#usr/include/diagnostics.h
#usr/include/dis-asm.h
#usr/include/libiberty.h
@@ -156,11 +158,21 @@ usr/bin/strings
#usr/lib/ldscripts/elf_x86_64.xu
#usr/lib/ldscripts/elf_x86_64.xw
#usr/lib/ldscripts/elf_x86_64.xwe
-usr/lib/libbfd-2.32.so
+usr/lib/libbfd-2.34.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
-usr/lib/libopcodes-2.32.so
+#usr/lib/libctf-nobfd.a
+#usr/lib/libctf-nobfd.la
+#usr/lib/libctf-nobfd.so
+usr/lib/libctf-nobfd.so.0
+usr/lib/libctf-nobfd.so.0.0.0
+#usr/lib/libctf.a
+#usr/lib/libctf.la
+#usr/lib/libctf.so
+usr/lib/libctf.so.0
+usr/lib/libctf.so.0.0.0
+usr/lib/libopcodes-2.34.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils
index 2d4f12a33..16e682a44 100644
--- a/config/rootfiles/common/x86_64/binutils
+++ b/config/rootfiles/common/x86_64/binutils
@@ -18,6 +18,8 @@ usr/bin/strings
#usr/include/bfd.h
#usr/include/bfd_stdint.h
#usr/include/bfdlink.h
+#usr/include/ctf-api.h
+#usr/include/ctf.h
#usr/include/diagnostics.h
#usr/include/dis-asm.h
#usr/include/libiberty.h
@@ -156,11 +158,21 @@ usr/bin/strings
#usr/lib/ldscripts/elf_x86_64.xu
#usr/lib/ldscripts/elf_x86_64.xw
#usr/lib/ldscripts/elf_x86_64.xwe
-usr/lib/libbfd-2.32.so
+usr/lib/libbfd-2.34.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
-usr/lib/libopcodes-2.32.so
+#usr/lib/libctf-nobfd.a
+#usr/lib/libctf-nobfd.la
+#usr/lib/libctf-nobfd.so
+usr/lib/libctf-nobfd.so.0
+usr/lib/libctf-nobfd.so.0.0.0
+#usr/lib/libctf.a
+#usr/lib/libctf.la
+#usr/lib/libctf.so
+usr/lib/libctf.so.0
+usr/lib/libctf.so.0.0.0
+usr/lib/libopcodes-2.34.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
diff --git a/lfs/binutils b/lfs/binutils
index 7df005146..334adad25 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 2.32
+VER = 2.34
THISAPP = binutils-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -94,7 +94,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0d174cdaf85721c5723bf52355be41e6
+$(DL_FILE)_MD5 = 664ec3a2df7805ed3464639aaae332d6
install : $(TARGET)
--
2.20.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] cairo: Update to 1.16.0
2020-03-20 13:37 ` [PATCH v2 1/2] cairo: Update to 1.16.0 Michael Tremer
2020-03-20 13:37 ` [PATCH v2 2/2] binutils: update to 2.34 Michael Tremer
@ 2020-03-20 17:21 ` Peter Müller
1 sibling, 0 replies; 5+ messages in thread
From: Peter Müller @ 2020-03-20 17:21 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4833 bytes --]
Thank you for providing this patch. :-)
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
> This updates the package and adds a patch so that it compiles
> with binutils 2.34.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
> config/rootfiles/common/cairo | 11 +++++------
> lfs/cairo | 5 +++--
> src/patches/cairo-1.16.0-binutils-2.34.patch | 20 ++++++++++++++++++++
> 3 files changed, 28 insertions(+), 8 deletions(-)
> create mode 100644 src/patches/cairo-1.16.0-binutils-2.34.patch
>
> diff --git a/config/rootfiles/common/cairo b/config/rootfiles/common/cairo
> index 12934cead..7cbb434d1 100644
> --- a/config/rootfiles/common/cairo
> +++ b/config/rootfiles/common/cairo
> @@ -15,23 +15,21 @@
> #usr/lib/cairo/libcairo-trace.a
> #usr/lib/cairo/libcairo-trace.la
> #usr/lib/cairo/libcairo-trace.so
> -usr/lib/cairo/libcairo-trace.so.0
> -usr/lib/cairo/libcairo-trace.so.0.0.0
> #usr/lib/libcairo-gobject.a
> #usr/lib/libcairo-gobject.la
> #usr/lib/libcairo-gobject.so
> usr/lib/libcairo-gobject.so.2
> -usr/lib/libcairo-gobject.so.2.11400.8
> +usr/lib/libcairo-gobject.so.2.11600.0
> #usr/lib/libcairo-script-interpreter.a
> #usr/lib/libcairo-script-interpreter.la
> #usr/lib/libcairo-script-interpreter.so
> usr/lib/libcairo-script-interpreter.so.2
> -usr/lib/libcairo-script-interpreter.so.2.11400.8
> +usr/lib/libcairo-script-interpreter.so.2.11600.0
> #usr/lib/libcairo.a
> #usr/lib/libcairo.la
> #usr/lib/libcairo.so
> usr/lib/libcairo.so.2
> -usr/lib/libcairo.so.2.11400.8
> +usr/lib/libcairo.so.2.11600.0
> #usr/lib/pkgconfig/cairo-fc.pc
> #usr/lib/pkgconfig/cairo-ft.pc
> #usr/lib/pkgconfig/cairo-gobject.pc
> @@ -65,6 +63,7 @@ usr/lib/libcairo.so.2.11400.8
> #usr/share/gtk-doc/html/cairo/cairo-Regions.html
> #usr/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
> #usr/share/gtk-doc/html/cairo/cairo-Script-Surfaces.html
> +#usr/share/gtk-doc/html/cairo/cairo-Tags-and-Links.html
> #usr/share/gtk-doc/html/cairo/cairo-Transformations.html
> #usr/share/gtk-doc/html/cairo/cairo-Types.html
> #usr/share/gtk-doc/html/cairo/cairo-User-Fonts.html
> @@ -92,13 +91,13 @@ usr/lib/libcairo.so.2.11400.8
> #usr/share/gtk-doc/html/cairo/index-1.10.html
> #usr/share/gtk-doc/html/cairo/index-1.12.html
> #usr/share/gtk-doc/html/cairo/index-1.14.html
> +#usr/share/gtk-doc/html/cairo/index-1.16.html
> #usr/share/gtk-doc/html/cairo/index-1.2.html
> #usr/share/gtk-doc/html/cairo/index-1.4.html
> #usr/share/gtk-doc/html/cairo/index-1.6.html
> #usr/share/gtk-doc/html/cairo/index-1.8.html
> #usr/share/gtk-doc/html/cairo/index-all.html
> #usr/share/gtk-doc/html/cairo/index.html
> -#usr/share/gtk-doc/html/cairo/index.sgml
> #usr/share/gtk-doc/html/cairo/language-bindings.html
> #usr/share/gtk-doc/html/cairo/left-insensitive.png
> #usr/share/gtk-doc/html/cairo/left.png
> diff --git a/lfs/cairo b/lfs/cairo
> index 0d28b5405..082cc4edd 100644
> --- a/lfs/cairo
> +++ b/lfs/cairo
> @@ -24,7 +24,7 @@
>
> include Config
>
> -VER = 1.14.8
> +VER = 1.16.0
>
> THISAPP = cairo-$(VER)
> DL_FILE = $(THISAPP).tar.xz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>
> -$(DL_FILE)_MD5 = 4ef0db2eacb271c74f8a3fd87822aa98
> +$(DL_FILE)_MD5 = f19e0353828269c22bd72e271243a552
>
> install : $(TARGET)
>
> @@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> @$(PREBUILD)
> @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cairo-1.16.0-binutils-2.34.patch
> cd $(DIR_APP) && ./configure --prefix=/usr \
> --disable-win32 --disable-os2 --disable-beos
> cd $(DIR_APP) && make $(MAKETUNING)
> diff --git a/src/patches/cairo-1.16.0-binutils-2.34.patch b/src/patches/cairo-1.16.0-binutils-2.34.patch
> new file mode 100644
> index 000000000..03daac0ec
> --- /dev/null
> +++ b/src/patches/cairo-1.16.0-binutils-2.34.patch
> @@ -0,0 +1,20 @@
> +--- a/util/cairo-trace/lookup-symbol.c
> ++++ b/util/cairo-trace/lookup-symbol.c
> +@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
> + if (symbol->found)
> + return;
> +
> +- if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0)
> ++ if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
> + return;
> +
> +- vma = bfd_get_section_vma (symtab->bfd, section);
> ++ vma = bfd_section_vma (section);
> + if (symbol->pc < vma)
> + return;
> +
> +- size = bfd_section_size (symtab->bfd, section);
> ++ size = bfd_section_size (section);
> + if (symbol->pc >= vma + size)
> + return;
> +
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-03-20 17:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-07 10:36 [PATCH] binutils: update to 2.34 Peter Müller
2020-03-08 11:37 ` Michael Tremer
2020-03-20 13:37 ` [PATCH v2 1/2] cairo: Update to 1.16.0 Michael Tremer
2020-03-20 13:37 ` [PATCH v2 2/2] binutils: update to 2.34 Michael Tremer
2020-03-20 17:21 ` [PATCH v2 1/2] cairo: Update to 1.16.0 Peter Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox