Skip to contentSkip to conversation

package/libglob: new package

PATCH New Bernd Kuhls 2 participants 3 messages Jul 31, 2016 – Aug 2, 2016

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/libglob: new package

Needed for packages which need GLOB_BRACE & GLOB_NOMAGIC. These defines are not provided by musl toolchains.

Signed-off-by Bernd Kuhls <[email protected]>

---
This patch is aimed at fixing the compilation of Openswan with musl, but the Openswan package needs many more patches so I am sending this package to be picked-up by other users trying to fix Openswan.

 package/Config.in            |  1 +
 package/libglob/Config.in    |  3 +++
 package/libglob/libglob.hash |  2 ++
 package/libglob/libglob.mk   | 27 +++++++++++++++++++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 package/libglob/Config.in
 create mode 100644 package/libglob/libglob.hash
 create mode 100644 package/libglob/libglob.mk
package/Config.in +1 -0
index 645fa29..54e9368 100644
@@ -1291,6 +1291,7 @@ menu "Other"
 	source "package/libffi/Config.in"
 	source "package/libgee/Config.in"
 	source "package/libglib2/Config.in"
+	source "package/libglob/Config.in"
 	source "package/libical/Config.in"
 	source "package/liblinear/Config.in"
 	source "package/libnspr/Config.in"
package/libglob/Config.in new file +3 -0
new file mode 100644
index 0000000..37ee520
@@ -0,0 +1,3 @@
+config BR2_PACKAGE_LIBGLOB
+	bool
+	default y if BR2_TOOLCHAIN_USES_MUSL
package/libglob/libglob.hash new file +2 -0
new file mode 100644
index 0000000..591d20a
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 4f1b204dad065689941c64828a92441fb316c9c7539b39525fa728125da65e22  libglob-1.0.tar.gz
package/libglob/libglob.mk new file +27 -0
new file mode 100644
index 0000000..eeca67a
@@ -0,0 +1,27 @@
+################################################################################
+#
+# libglob
+#
+################################################################################
+
+LIBGLOB_VERSION = 1.0
+LIBGLOB_SITE = $(call github,voidlinux,libglob,$(LIBGLOB_VERSION))
+LIBGLOB_LICENSE = BSD-3c
+LIBGLOB_LICENSE_FILES = LICENSE
+
+LIBGLOB_ADD_TOOLCHAIN_DEPENDENCY = NO
+LIBGLOB_INSTALL_STAGING = YES
+
+define LIBGLOB_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
+endef
+
+define LIBGLOB_INSTALL_STAGING_CMDS
+	$(MAKE) PREFIX=/usr DESTDIR=$(STAGING_DIR) -C $(@D) install
+endef
+
+define LIBGLOB_INSTALL_TARGET_CMDS
+	$(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
+
+$(eval $(generic-package))
Signature · 1 line
2.8.1
#1 lore raw

PATCH 1/1 package/libglob: new package

Hi,

Quoted 5 lines · Bernd Kuhls

Needed for packages which need GLOB_BRACE & GLOB_NOMAGIC. These defines
are not provided by musl toolchains.

Signed-off-by Bernd Kuhls <[email protected]>

sorry, I didn't noticed you already submitted a patch to add libglob. I submitted a similar patch, too:?http://lists.busybox.net/pipermail/buil droot/2016-August/168908.html.

Thanks to Thomas for pointing that out.

Quoted 34 lines

---
This patch is aimed at fixing the compilation of Openswan with musl, but
the Openswan package needs many more patches so I am sending this package
to be picked-up by other users trying to fix Openswan.

?package/Config.in????????????|??1 +
?package/libglob/Config.in????|??3 +++
?package/libglob/libglob.hash |??2 ++
?package/libglob/libglob.mk???| 27 +++++++++++++++++++++++++++

?4 files changed, 33 insertions(+)
?create mode 100644 package/libglob/Config.in
?create mode 100644 package/libglob/libglob.hash
?create mode 100644 package/libglob/libglob.mk

package/Config.in +0 -0
index 645fa29..54e9368 100644
@@ -1291,6 +1291,7 @@ menu "Other"

? source "package/libffi/Config.in"
? source "package/libgee/Config.in"
? source "package/libglib2/Config.in"

package/Config.in +1 -0
+	source "package/libglob/Config.in"

? source "package/libical/Config.in"
? source "package/liblinear/Config.in"
? source "package/libnspr/Config.in"

package/libglob/Config.in new file +0 -0
new file mode 100644
index 0000000..37ee520

package/libglob/Config.in line 3

Quoted 3 lines
package/libglob/Config.in new file +3 -0
@@ -0,0 +1,3 @@
+config BR2_PACKAGE_LIBGLOB
+	bool
+	default y if BR2_TOOLCHAIN_USES_MUSL

So you make it non-selectable for the user. Probably it's okay, as there is no need for this package besides allowing packages needing the glob implementation to be build with musl.

Quoted 34 lines
package/libglob/libglob.hash new file +2 -0
new file mode 100644
index 0000000..591d20a
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256

4f1b204dad065689941c64828a92441fb316c9c7539b39525fa728125da65e22??lib glob-1.0.tar.gz

package/libglob/libglob.mk new file +1 -0
new file mode 100644
index 0000000..eeca67a
@@ -0,0 +1,27 @@
+####################################################################

############

package/libglob/libglob.mk new file +4 -0
+#
+# libglob
+#
+####################################################################

############

package/libglob/libglob.mk new file +10 -0
+
+LIBGLOB_VERSION = 1.0
+LIBGLOB_SITE = $(call github,voidlinux,libglob,$(LIBGLOB_VERSION))
+LIBGLOB_LICENSE = BSD-3c
+LIBGLOB_LICENSE_FILES = LICENSE
+
+LIBGLOB_ADD_TOOLCHAIN_DEPENDENCY = NO
+LIBGLOB_INSTALL_STAGING = YES
+
+define LIBGLOB_BUILD_CMDS

package/libglob/libglob.mk line 25

Quoted 10 lines
package/libglob/libglob.mk new file +10 -0
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
+endef
+
+define LIBGLOB_INSTALL_STAGING_CMDS
+	$(MAKE) PREFIX=/usr DESTDIR=$(STAGING_DIR) -C $(@D) install
+endef
+
+define LIBGLOB_INSTALL_TARGET_CMDS
+	$(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef

This installs both, the shared and the static files.

Quoted 2 lines

+
+$(eval $(generic-package))

Best regards
J?rg Krause

author
#2 lore raw

PATCH 1/1 package/libglob: new package

Hi J?rg,

Am Mon, 01 Aug 2016 22:29:07 +0200 schrieb J?rg Krause:

Quoted 7 lines

Hi,

Quoted 4 lines · Bernd Kuhls

Needed for packages which need GLOB_BRACE & GLOB_NOMAGIC. These defines
are not provided by musl toolchains.

Quoted 5 lines
Quoted 1 line
Signed-off-by Bernd Kuhls <[email protected]>

sorry, I didn't noticed you already submitted a patch to add libglob. I submitted a similar patch, too:?http://lists.busybox.net/pipermail/buil droot/2016-August/168908.html.

yes, but your patch is better because it takes the static-only scenario into account. Therefore I closed my patch in patchworks.

Regards, Bernd