Skip to contentSkip to conversation

liburcu: Add support for aarch64 and bump version to 0.8.7

PATCH New Ben Shelton 2 participants 5 messages Sep 11, 2015 – Sep 12, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 liburcu: Add support for aarch64 and bump version to 0.8.7

Bring over a patch from OpenEmbedded to treat aarch64 like arm in the build process, which allows the build to succeed.

---
 package/liburcu/0002-support-aarch64.patch | 21 +++++++++++++++++++++
 package/liburcu/Config.in                  |  4 ++--
 package/liburcu/liburcu.hash               |  6 +++---
 package/liburcu/liburcu.mk                 |  3 ++-
 4 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 package/liburcu/0002-support-aarch64.patch
package/liburcu/0002-support-aarch64.patch new file +21 -0
new file mode 100644
index 0000000..6830e25
@@ -0,0 +1,21 @@
+libucru: recognize aarch64
+
+Make the same as "arm" internally.
+
+Upstream-Status: Pending
+
+Signed-off-by: joe.slater at windriver.com
+[moved to buildroot from openembedded-core]
+Signed-off-by: Ben Shelton <[email protected]>
+
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,6 +77,7 @@ AS_CASE([$host_cpu],
+ 	[alpha*], [ARCHTYPE="alpha"],
+ 	[ia64], [ARCHTYPE="gcc"],
+ 	[arm*], [ARCHTYPE="arm"],
++	[aarch64], [ARCHTYPE="arm"],
+ 	[mips*], [ARCHTYPE="mips"],
+ 	[tile*], [ARCHTYPE="gcc"],
+ 	[ARCHTYPE="unknown"]
package/liburcu/Config.in +2 -2
index e7cbe93..a4e8dc8 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBURCU
 	bool "liburcu"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
@@ -18,7 +18,7 @@ config BR2_PACKAGE_LIBURCU
 	  http://lttng.org/urcu
 
 comment "liburcu needs a toolchain w/ threads"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
package/liburcu/liburcu.hash +3 -3
index 2b1693d..64ba901 100644
@@ -1,4 +1,4 @@
-# http://www.lttng.org/files/urcu/userspace-rcu-0.8.6.tar.bz2.sha1
-sha1  f10e9bf812557cd0c2a35a277e04010ec278d25d  userspace-rcu-0.8.6.tar.bz2
+# http://www.lttng.org/files/urcu/userspace-rcu-0.8.7.tar.bz2.sha1
+sha1  5306999b8a3296f3dea91246d92e0a993d732898  userspace-rcu-0.8.7.tar.bz2
 # Locally generated
-sha256 b1a5d3bce014ba7a702759bc60b692c1cd46ff0e8a5b53f0d0a95e22db74ab21 userspace-rcu-0.8.6.tar.bz2
+sha256 b523f22c4726ca6bb77a77d258e76d8c33c89724433bd65313024b98e55c4295 userspace-rcu-0.8.7.tar.bz2
package/liburcu/liburcu.mk +2 -1
index 1582d07..c886a1c 100644
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-LIBURCU_VERSION = 0.8.6
+LIBURCU_VERSION = 0.8.7
 LIBURCU_SITE = http://lttng.org/files/urcu
 LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE; GPLv2+ for test; GPLv3 for few *.m4 files
 LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE
 
+LIBURCU_AUTORECONF = YES
 LIBURCU_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
Signature · 1 line
1.9.5
#1 lore raw

PATCH 2/3 lttng-libust: bump version to 2.6.2 and enable aarch64 build

---
 package/lttng-libust/Config.in         | 4 ++--
 package/lttng-libust/lttng-libust.hash | 4 ++--
 package/lttng-libust/lttng-libust.mk   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
package/lttng-libust/Config.in +2 -2
index 1c26843..3c26055 100644
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LTTNG_LIBUST
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	depends on BR2_USE_WCHAR # util-linux
 	# liburcu only works on some architectures and requires threads support"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
@@ -18,7 +18,7 @@ config BR2_PACKAGE_LTTNG_LIBUST
 	  http://lttng.org
 
 comment "lttng-libust needs a toolchain w/ dynamic library, wchar, threads"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
 
package/lttng-libust/lttng-libust.hash +2 -2
index 65db612..aafc2ba 100644
@@ -1,2 +1,2 @@
-# http://www.lttng.org/files/lttng-ust/lttng-ust-2.6.0.tar.bz2.sha1
-sha1  774fc2052781ba6fd789d422223c739d5f64482d  lttng-ust-2.6.0.tar.bz2
+# http://www.lttng.org/files/lttng-ust/lttng-ust-2.6.2.tar.bz2.sha1
+sha1  bfa9cbdabd8698cf5b98667eac5c39775127f634  lttng-ust-2.6.2.tar.bz2
package/lttng-libust/lttng-libust.mk +1 -1
index 2afcd61..4976ff4 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-LTTNG_LIBUST_VERSION = 2.6.0
+LTTNG_LIBUST_VERSION = 2.6.2
 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 LTTNG_LIBUST_LICENSE = LGPLv2.1; MIT for system headers; GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond)
 LTTNG_LIBUST_LICENSE_FILES = COPYING
Signature · 1 line
1.9.5
#2 lore raw

PATCH 2/3 lttng-libust: bump version to 2.6.2 and enable aarch64 build

Dear Ben Shelton,

same comment again. "Bumping the version" and "adding support for a new architecture" should be separate patches, IMHO.

Regards,

Vincent.

Quoted 52 lines · Ben Shelton
---
  package/lttng-libust/Config.in         | 4 ++--
  package/lttng-libust/lttng-libust.hash | 4 ++--
  package/lttng-libust/lttng-libust.mk   | 2 +-
  3 files changed, 5 insertions(+), 5 deletions(-)
package/lttng-libust/Config.in +2 -2
index 1c26843..3c26055 100644
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LTTNG_LIBUST
  	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
  	depends on BR2_USE_WCHAR # util-linux
  	# liburcu only works on some architectures and requires threads support"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
  	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
  	depends on BR2_TOOLCHAIN_HAS_THREADS
  	depends on !BR2_STATIC_LIBS
@@ -18,7 +18,7 @@ config BR2_PACKAGE_LTTNG_LIBUST
  	  http://lttng.org
 
  comment "lttng-libust needs a toolchain w/ dynamic library, wchar, threads"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
  	depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
  	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
 
package/lttng-libust/lttng-libust.hash +2 -2
index 65db612..aafc2ba 100644
@@ -1,2 +1,2 @@
-# http://www.lttng.org/files/lttng-ust/lttng-ust-2.6.0.tar.bz2.sha1
-sha1  774fc2052781ba6fd789d422223c739d5f64482d  lttng-ust-2.6.0.tar.bz2
+# http://www.lttng.org/files/lttng-ust/lttng-ust-2.6.2.tar.bz2.sha1
+sha1  bfa9cbdabd8698cf5b98667eac5c39775127f634  lttng-ust-2.6.2.tar.bz2
package/lttng-libust/lttng-libust.mk +1 -1
index 2afcd61..4976ff4 100644
@@ -5,7 +5,7 @@
  ################################################################################
 
  LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-LTTNG_LIBUST_VERSION = 2.6.0
+LTTNG_LIBUST_VERSION = 2.6.2
  LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
  LTTNG_LIBUST_LICENSE = LGPLv2.1; MIT for system headers; GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond)
  LTTNG_LIBUST_LICENSE_FILES = COPYING
#3 lore raw

PATCH 3/3 lttng-tools: enable aarch64 build

In reply to Ben Shelton

Now that liburcu builds for aarch64, lttng-tools has all its dependencies met for aarch64, so allow it to build for this architecture.

---
 package/lttng-tools/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/lttng-tools/Config.in +2 -2
index 4d4b923..4c5b5f6 100644
@@ -6,7 +6,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	# liburcu only works on some architectures and requires thread support
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58595 # lttng-tools/gcc-4.{7,8}.x bug
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
 	depends on BR2_USE_WCHAR # util-linux
@@ -30,7 +30,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	  http://lttng.org
 
 comment "lttng-tools needs a toolchain w/ threads, wchar"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58595 # lttng-tools/gcc-4.{7,8}.x bug
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
Signature · 1 line
1.9.5
#4 lore raw

PATCH 1/3 liburcu: Add support for aarch64 and bump version to 0.8.7

In reply to Ben Shelton

Dear Ben Shelton,

I think "bumping the version" and "adding support for a new architecture" should be separate patches.

Regards,

Vincent.

Quoted 92 lines · Ben Shelton

Bring over a patch from OpenEmbedded to treat aarch64 like arm in the build process, which allows the build to succeed.

---
  package/liburcu/0002-support-aarch64.patch | 21 +++++++++++++++++++++
  package/liburcu/Config.in                  |  4 ++--
  package/liburcu/liburcu.hash               |  6 +++---
  package/liburcu/liburcu.mk                 |  3 ++-
  4 files changed, 28 insertions(+), 6 deletions(-)

create mode 100644 package/liburcu/0002-support-aarch64.patch

package/liburcu/0002-support-aarch64.patch new file +21 -0
new file mode 100644
index 0000000..6830e25
@@ -0,0 +1,21 @@
+libucru: recognize aarch64
+
+Make the same as "arm" internally.
+
+Upstream-Status: Pending
+
+Signed-off-by: joe.slater at windriver.com
+[moved to buildroot from openembedded-core]
+Signed-off-by: Ben Shelton <[email protected]>
+
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,6 +77,7 @@ AS_CASE([$host_cpu],
+ 	[alpha*], [ARCHTYPE="alpha"],
+ 	[ia64], [ARCHTYPE="gcc"],
+ 	[arm*], [ARCHTYPE="arm"],
++	[aarch64], [ARCHTYPE="arm"],
+ 	[mips*], [ARCHTYPE="mips"],
+ 	[tile*], [ARCHTYPE="gcc"],
+ 	[ARCHTYPE="unknown"]
package/liburcu/Config.in +2 -2
index e7cbe93..a4e8dc8 100644
@@ -1,6 +1,6 @@
  config BR2_PACKAGE_LIBURCU
  	bool "liburcu"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
  	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
  	depends on BR2_TOOLCHAIN_HAS_THREADS
  	help
@@ -18,7 +18,7 @@ config BR2_PACKAGE_LIBURCU
  	  http://lttng.org/urcu
 
  comment "liburcu needs a toolchain w/ threads"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
  	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
  	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
package/liburcu/liburcu.hash +3 -3
index 2b1693d..64ba901 100644
@@ -1,4 +1,4 @@
-# http://www.lttng.org/files/urcu/userspace-rcu-0.8.6.tar.bz2.sha1
-sha1  f10e9bf812557cd0c2a35a277e04010ec278d25d  userspace-rcu-0.8.6.tar.bz2
+# http://www.lttng.org/files/urcu/userspace-rcu-0.8.7.tar.bz2.sha1
+sha1  5306999b8a3296f3dea91246d92e0a993d732898  userspace-rcu-0.8.7.tar.bz2
  # Locally generated
-sha256 b1a5d3bce014ba7a702759bc60b692c1cd46ff0e8a5b53f0d0a95e22db74ab21 userspace-rcu-0.8.6.tar.bz2
+sha256 b523f22c4726ca6bb77a77d258e76d8c33c89724433bd65313024b98e55c4295 userspace-rcu-0.8.7.tar.bz2
package/liburcu/liburcu.mk +2 -1
index 1582d07..c886a1c 100644
@@ -4,12 +4,13 @@
  #
  ################################################################################
 
-LIBURCU_VERSION = 0.8.6
+LIBURCU_VERSION = 0.8.7
  LIBURCU_SITE = http://lttng.org/files/urcu
  LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
  LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE; GPLv2+ for test; GPLv3 for few *.m4 files
  LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE
 
+LIBURCU_AUTORECONF = YES
  LIBURCU_INSTALL_STAGING = YES
 
  $(eval $(autotools-package))