diff mbox series

[RFC,v1,1/2] package/ck: new package

Message ID 20230525132353.89399-2-svromanov@sberdevices.ru
State Superseded
Headers show
Series Added package: 'sysbench' and its dependency: 'ck'. | expand

Commit Message

Sergey Romanov May 25, 2023, 1:23 p.m. UTC 
Concurrency primitives, safe memory reclamation
mechanisms and non-blocking data structures
for the research, design and implementation
of high performance concurrent systems.

https://github.com/concurrencykit/ck.git

Signed-off-by: Sergey Romanov <svromanov@sberdevices.ru>
---
 DEVELOPERS                                    |   3 +
 package/Config.in                             |   1 +
 ...oid-buildroot-s-influence-on-LDFLAGS.patch | 187 ++++++++++++++++++
 package/ck/Config.in                          |  23 +++
 package/ck/ck.hash                            |   3 +
 package/ck/ck.mk                              |  42 ++++
 6 files changed, 259 insertions(+)
 create mode 100644 package/ck/0001-avoid-buildroot-s-influence-on-LDFLAGS.patch
 create mode 100644 package/ck/Config.in
 create mode 100644 package/ck/ck.hash
 create mode 100644 package/ck/ck.mk
diff mbox series

Patch

diff --git a/DEVELOPERS b/DEVELOPERS
index e76717e845..4accefb251 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2626,6 +2626,9 @@  F:	package/rtl8189fs/
 F:	package/wpa_supplicant/
 F:	package/xr819-xradio/
 
+N:	Sergey Romanov <svromanov@sberdevices.ru>
+F:	package/ck/
+
 N:	Sergio Prado <sergio.prado@e-labworks.com>
 F:	board/toradex/apalis-imx6/
 F:	configs/toradex_apalis_imx6_defconfig
diff --git a/package/Config.in b/package/Config.in
index 420ebaa370..c81ddc81f6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -92,6 +92,7 @@  menu "Debugging, profiling and benchmark"
 	source "package/bonnie/Config.in"
 	source "package/bpftool/Config.in"
 	source "package/cache-calibrator/Config.in"
+	source "package/ck/Config.in"
 	source "package/clinfo/Config.in"
 	source "package/clpeak/Config.in"
 	source "package/coremark/Config.in"
diff --git a/package/ck/0001-avoid-buildroot-s-influence-on-LDFLAGS.patch b/package/ck/0001-avoid-buildroot-s-influence-on-LDFLAGS.patch
new file mode 100644
index 0000000000..be3b33bf35
--- /dev/null
+++ b/package/ck/0001-avoid-buildroot-s-influence-on-LDFLAGS.patch
@@ -0,0 +1,187 @@ 
+Avoid buildroot's influence on LDFLAGS
+
+Signed-off-by: Sergey Romanov <svromanov@sberdevices.ru>
+
+---
+ build/ck.build.in          |  2 +-
+ build/ck.build.ppc64       |  2 +-
+ build/ck.build.x86_64      |  2 +-
+ build/regressions.build.in |  2 +-
+ configure                  | 28 +++++++++++++++-------------
+ src/Makefile.in            |  2 +-
+ 6 files changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/build/ck.build.in b/build/ck.build.in
+index 1d6bfe3..f68b5b7 100644
+--- a/build/ck.build.in
++++ b/build/ck.build.in
+@@ -3,7 +3,7 @@ MAKE=make
+ SRC_DIR=@SRC_DIR@
+ BUILD_DIR=@BUILD_DIR@
+ CFLAGS+=@CFLAGS@ -I$(SRC_DIR)/include -I$(BUILD_DIR)/include
+-LDFLAGS+=@LDFLAGS@
++LDFLAGS_CK+=@LDFLAGS_CK@
+ ALL_LIBS=@ALL_LIBS@
+ LD=@LD@
+ 
+diff --git a/build/ck.build.ppc64 b/build/ck.build.ppc64
+index 51003f4..7e25f10 100644
+--- a/build/ck.build.ppc64
++++ b/build/ck.build.ppc64
+@@ -1,2 +1,2 @@
+ CFLAGS+=-m64 -D__ppc64__
+-LDFLAGS+=-m64
++LDFLAGS_CK+=-m64
+diff --git a/build/ck.build.x86_64 b/build/ck.build.x86_64
+index 81b378a..160c4f1 100644
+--- a/build/ck.build.x86_64
++++ b/build/ck.build.x86_64
+@@ -1,2 +1,2 @@
+ CFLAGS+=-m64 -D__x86_64__
+-LDFLAGS+=-m64
++LDFLAGS_CK+=-m64
+diff --git a/build/regressions.build.in b/build/regressions.build.in
+index 6d79a8b..f1c7515 100644
+--- a/build/regressions.build.in
++++ b/build/regressions.build.in
+@@ -3,7 +3,7 @@ MAKE=make
+ CORES=@CORES@
+ CFLAGS=@CFLAGS@ -I../../../include -DCORES=@CORES@
+ LD=@LD@
+-LDFLAGS=@LDFLAGS@
++LDFLAGS_CK=@LDFLAGS_CK@
+ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
+ BUILD_DIR=@BUILD_DIR@
+ 
+diff --git a/configure b/configure
+index 340e05c..f73104a 100755
+--- a/configure
++++ b/configure
+@@ -112,7 +112,7 @@ generate()
+ 	    -e "s#@ALL_LIBS@#$ALL_LIBS#g"			\
+ 	    -e "s#@INSTALL_LIBS@#$INSTALL_LIBS#g"		\
+ 	    -e "s#@LD@#$LD#g"					\
+-	    -e "s#@LDFLAGS@#$LDFLAGS#g"				\
++	    -e "s#@LDFLAGS_CK@#$LDFLAGS_CK#g"				\
+ 	    -e "s#@PTHREAD_CFLAGS@#$PTHREAD_CFLAGS#g"		\
+ 	    -e "s#@MANDIR@#$MANDIR#g"				\
+ 	    -e "s#@GZIP@#$GZIP#g"				\
+@@ -156,7 +156,7 @@ generate_stdout()
+ 	echo "            LDNAME = $LDNAME"
+ 	echo "    LDNAME_VERSION = $LDNAME_VERSION"
+ 	echo "      LDNAME_MAJOR = $LDNAME_MAJOR"
+-	echo "           LDFLAGS = $LDFLAGS"
++	echo "        LDFLAGS_CK = $LDFLAGS_CK"
+ 	echo "        STATIC_LIB = $DISABLE_STATIC"
+ 	echo "              GZIP = $GZIP"
+ 	echo "             CORES = $CORES"
+@@ -222,7 +222,7 @@ for option; do
+ 		echo "   AR       AR archiver command"
+ 		echo "   CC       C compiler command"
+ 		echo "   CFLAGS   C compiler flags"
+-		echo "   LDFLAGS  Linker flags"
++		echo "   LDFLAGS_CK  Linker flags"
+ 		echo "   GZIP     GZIP compression tool"
+ 		echo
+ 		echo "Report bugs to ${MAINTAINER}."
+@@ -376,15 +376,15 @@ case "$SYSTEM" in
+ 		;;
+ 	MINGW32*|MSYS_NT*)
+ 		SYSTEM=mingw32
+-		LDFLAGS="-mthreads $LDFLAGS"
++		LDFLAGS_CK="-mthreads $LDFLAGS_CK"
+ 		;;
+ 	MINGW64*)
+ 		SYSTEM=mingw64
+-		LDFLAGS="-mthreads $LDFLAGS"
++		LDFLAGS_CK="-mthreads $LDFLAGS_CK"
+ 		;;
+ 	CYGWIN_NT*)
+ 		SYSTEM=cygwin
+-		LDFLAGS="-mthreads $LDFLAGS"
++		LDFLAGS_CK="-mthreads $LDFLAGS_CK"
+ 		;;
+ 	*)
+ 		SYSTEM=
+@@ -413,7 +413,7 @@ case $PLATFORM in
+ 		MM="${MM:-"CK_MD_RMO"}"
+ 		PLATFORM=ppc
+ 		ENVIRONMENT=32
+-		LDFLAGS="-m32 $LDFLAGS"
++		LDFLAGS_CK="-m32 $LDFLAGS_CK"
+ 		;;
+ 	"sun4u"|"sun4v"|"sparc64")
+ 		RTM_ENABLE="CK_MD_RTM_DISABLE"
+@@ -421,7 +421,7 @@ case $PLATFORM in
+ 		MM="${MM:-"CK_MD_TSO"}"
+ 		PLATFORM=sparcv9
+ 		ENVIRONMENT=64
+-		LDFLAGS="-m64 $LDFLAGS"
++		LDFLAGS_CK="-m64 $LDFLAGS_CK"
+ 		;;
+ 	i386|i486|i586|i686|i586_i686|pentium*|athlon*|k5|k6|k6_2|k6_3)
+ 		LSE_ENABLE="CK_MD_LSE_DISABLE"
+@@ -474,7 +474,7 @@ case $PLATFORM in
+ 		LSE_ENABLE="CK_MD_LSE_DISABLE"
+ 		PLATFORM=x86_64
+ 		ENVIRONMENT=64
+-		LDFLAGS="-m64 $LDFLAGS"
++		LDFLAGS_CK="-m64 $LDFLAGS_CK"
+ 		MM="${MM:-"CK_MD_TSO"}"
+ 		;;
+ 	"i86pc")
+@@ -686,6 +686,8 @@ $CC -o .1 .1.c
+ COMPILER=`./.1 2> /dev/null`
+ r=$?
+ rm -f .1.c .1
++COMPILER="gcc"
++r=0
+ 
+ if test "$r" -ne 0; then
+ 	assert "" "update compiler"
+@@ -695,7 +697,7 @@ fi
+ 
+ if test "$COMPILER" = "suncc"; then
+ 	LD=/bin/ld
+-	LDFLAGS="-G -z text -h libck.so.$VERSION_MAJOR $LDFLAGS"
++	LDFLAGS_CK="-G -z text -h libck.so.$VERSION_MAJOR $LDFLAGS_CK"
+ 	CFLAGS="-xO5 $CFLAGS"
+ 	PTHREAD_CFLAGS="-mt -lpthread"
+ elif test "$COMPILER" = "gcc" || test "$COMPILER" = "clang" || test "$COMPILER" = "mingw32" || test "$COMPILER" = "mingw64"; then
+@@ -711,9 +713,9 @@ elif test "$COMPILER" = "gcc" || test "$COMPILER" = "clang" || test "$COMPILER"
+ 		CC_WL_OPT="-soname"
+ 	fi
+ 
+-	LDFLAGS="-Wl,$CC_WL_OPT,$SONAME $LDFLAGS"
++	LDFLAGS_CK="-Wl,$CC_WL_OPT,$SONAME $LDFLAGS_CK"
+ 	if test "$WANT_PIC" = "yes"; then
+-		LDFLAGS="$LDFLAGS -shared -fPIC"
++		LDFLAGS_CK="$LDFLAGS_CK -shared -fPIC"
+ 		CFLAGS="$CFLAGS -fPIC"
+ 
+ 		if [ "$DISABLE_STATIC" -eq 1 ]; then
+@@ -724,7 +726,7 @@ elif test "$COMPILER" = "gcc" || test "$COMPILER" = "clang" || test "$COMPILER"
+ 			INSTALL_LIBS="install-so install-lib"
+ 		fi
+ 	else
+-		LDFLAGS="$LDFLAGS -fno-PIC"
++		LDFLAGS_CK="$LDFLAGS_CK -fno-PIC"
+ 		CFLAGS="$CFLAGS -fno-PIC"
+ 		if [ "$DISABLE_STATIC" -eq 1 ]; then
+ 			echo "Error: You have choosen to disable PIC, yet you also disabled the static lib." 1>&2
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 7378849..ee6f9ee 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -22,7 +22,7 @@ OBJECTS=ck_barrier_centralized.o	\
+ all: $(ALL_LIBS)
+ 
+ libck.so: $(OBJECTS)
+-	$(LD) $(LDFLAGS) -o $(TARGET_DIR)/libck.so $(OBJECTS)
++	$(LD) $(LDFLAGS_CK) -o $(TARGET_DIR)/libck.so $(OBJECTS)
+ 
+ libck.a: $(OBJECTS)
+ 	$(AR) rcs $(TARGET_DIR)/libck.a $(OBJECTS)
+-- 
+2.25.1
+
diff --git a/package/ck/Config.in b/package/ck/Config.in
new file mode 100644
index 0000000000..d88eaa8413
--- /dev/null
+++ b/package/ck/Config.in
@@ -0,0 +1,23 @@ 
+config BR2_PACKAGE_CK_ARCH_SUPPORTS
+	bool
+	default y if ((BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 && \
+		!BR2_ARM_CPU_ARMV7M) || BR2_aarch64 || \
+		BR2_powerpc || BR2_powerpc64 || BR2_RISCV_64 || \
+		BR2_s390x || BR2_sparc_v9 || BR2_x86 || BR2_x86_64)
+
+config BR2_PACKAGE_CK_TOOLCHAIN_SUPPORTS
+	bool
+	default y if ((BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_USES_GLIBC) && \
+		!BR2_TOOLCHAIN_USES_UCLIBC)
+
+config BR2_PACKAGE_CK
+	bool "concurrency kit"
+	depends on BR2_PACKAGE_CK_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_CK_TOOLCHAIN_SUPPORTS
+	help
+	  Concurrency primitives, safe memory reclamation
+	  mechanisms and non-blocking data structures
+	  for the research, design and implementation
+	  of high performance concurrent systems.
+
+	  https://github.com/concurrencykit/ck.git
diff --git a/package/ck/ck.hash b/package/ck/ck.hash
new file mode 100644
index 0000000000..6d77ae4bee
--- /dev/null
+++ b/package/ck/ck.hash
@@ -0,0 +1,3 @@ 
+# Locally calculated
+sha256  97d2a21d5326ef79b4668be2e6eda6284ee77a64c0981b35fd9695c736c3d4ac  ck-0.7.1.tar.gz
+sha256  21a861f554f8f97047815e63ff5cbd57707b4c53dc1dd1b0f2dd43e6ca193464  LICENSE
diff --git a/package/ck/ck.mk b/package/ck/ck.mk
new file mode 100644
index 0000000000..ecdeadb057
--- /dev/null
+++ b/package/ck/ck.mk
@@ -0,0 +1,42 @@ 
+################################################################################
+#
+# ck
+#
+################################################################################
+
+CK_VERSION = 0.7.1
+CK_SITE = $(call github,concurrencykit,ck,$(CK_VERSION))
+CK_LICENSE = Apache-2.0
+CK_LICENSE_FILES = LICENSE
+
+CK_INSTALL_STAGING = YES
+
+CK_PROFILE_PARAMS += --platform=$(BR2_ARCH)
+CK_PROFILE_PARAMS += --prefix="/usr"
+
+define CK_CONFIGURE_CMDS
+	( cd $(@D); \
+	$(TARGET_CONFIGURE_OPTS) \
+	$(CK_PROFILE_CONF_ENV) \
+	./configure $(CK_PROFILE_PARAMS) )
+endef
+
+define CK_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) \
+	$(CK_PROFILE_CONF_ENV) \
+	$(MAKE) -C $(@D)
+endef
+
+define CK_INSTALL_TARGET_CMDS
+	$(TARGET_CONFIGURE_OPTS) \
+	$(CK_PROFILE_CONF_ENV) \
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+define CK_INSTALL_STAGING_CMDS
+	$(TARGET_CONFIGURE_OPTS) \
+	$(CK_PROFILE_CONF_ENV) \
+	$(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+$(eval $(generic-package))