Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (332d84a789f7bb03cd1684cd12248182d757758a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (332d84a789f7bb03cd1684cd12248182d757758a)
  • Date: Wed, 17 Feb 2021 18:14:56 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/lockdev/BUILD | 6 ++
libs/lockdev/HISTORY | 6 ++
libs/lockdev/PRE_BUILD | 4 -
libs/lockdev/lockdev-1.0.3-add-autotools.patch | 55
---------------------
libs/lockdev/lockdev-1.0.3-fix-perl.patch | 11 ----
libs/lockdev/patches/0001-add-autotools.patch | 55
+++++++++++++++++++++
libs/lockdev/patches/0002-fix-perl.patch | 11 ++++
libs/lockdev/patches/0003-major-minor-macros.patch | 29 +++++++++++
utils/schroot/DEPENDS | 6 --
utils/schroot/HISTORY | 4 +
utils/schroot/PRE_BUILD | 1
utils/schroot/patches/0001-musl.patch | 25 +++++++++
12 files changed, 140 insertions(+), 73 deletions(-)

New commits:
commit 332d84a789f7bb03cd1684cd12248182d757758a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

schroot: Fix build against musl

commit 8a2d0baab065b3f9742a308224e6ac0ae0f06909
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

schroot: Make gettext a hard dep

It fails to build when configured with the --disable-nls flag.

commit 673ccb51165d1e534f7db8f3b1a32c126b1810a7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lockdev: Fix build against musl

commit ead017c2745e1091cea410ee061339e1d185c77c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lockdev: Use apply_patch_dir and cleanup patches

diff --git a/libs/lockdev/BUILD b/libs/lockdev/BUILD
new file mode 100755
index 0000000..1860a86
--- /dev/null
+++ b/libs/lockdev/BUILD
@@ -0,0 +1,6 @@
+case "$HOST" in
+ (*-musl)
+ CFLAGS+=' -D__GNU_LIBRARY__'
+ ;;
+esac &&
+default_build
diff --git a/libs/lockdev/HISTORY b/libs/lockdev/HISTORY
index 35def4a..d3f2366 100644
--- a/libs/lockdev/HISTORY
+++ b/libs/lockdev/HISTORY
@@ -1,3 +1,9 @@
+2021-02-17 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/0001-add-autotools.patch,
+ patches/0002-fix-perl.patch: Cleaned up the patches and modified to
+ use apply_patch_dir
+ * BUILD, patches/0003-major-minor-macros.patch: Fixed build against
musl
+
2019-09-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, lockdev-1.0.3-add-autotools.patch,
lockdev-1.0.3-fix-perl.patch: apply patches from gentoo
diff --git a/libs/lockdev/PRE_BUILD b/libs/lockdev/PRE_BUILD
index 4f1960d..d2679aa 100755
--- a/libs/lockdev/PRE_BUILD
+++ b/libs/lockdev/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/lockdev-1.0.3-add-autotools.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/lockdev-1.0.3-fix-perl.patch" &&
+apply_patch_dir patches &&

touch NEWS &&
touch README &&
diff --git a/libs/lockdev/lockdev-1.0.3-add-autotools.patch
b/libs/lockdev/lockdev-1.0.3-add-autotools.patch
deleted file mode 100644
index f54bcb8..0000000
--- a/libs/lockdev/lockdev-1.0.3-add-autotools.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Adds an autotools build system to fix the many issues with the custom build
-system (ignoring CC, CFLAGS, DESTDIR, not installing the .so file properly).
-
-Contributed by Nick Fortino (nfortino AT gmail.com) 2/1/2009
-
-Updated by Jonathan Callen <abcd AT gentoo.org> 2009-09-11
-
---- Makefile.am
-+++ Makefile.am
-@@ -0,0 +1,20 @@
-+include_HEADERS = src/lockdev.h src/ttylock.h
-+
-+lib_LTLIBRARIES = liblockdev.la
-+liblockdev_la_SOURCES = src/lockdev.c
-+liblockdev_version = -version-info
$(LOCKDEV_CURRENT_INTERFACE):$(LOCKDEV_INTERFACE_AGE):$(LOCKDEV_BINARY_AGE)
-+liblockdev_la_LDFLAGS = $(liblockdev_version)
-+
-+man_MANS = docs/lockdev.3
-+
-+manpage_links = \
-+ dev_lock.3 \
-+ dev_unlock.3 \
-+ dev_relock.3 \
-+ dev_testlock.3 \
-+ liblockdev.3
-+
-+install-data-hook:
-+ for page in $(manpage_links); do \
-+ $(LN_S) -f lockdev.3 $(DESTDIR)$(man3dir)/$${page} ; \
-+ done
---- configure.ac
-+++ configure.ac
-@@ -0,0 +1,22 @@
-+AC_INIT([lockdev], [1.0.3], [BUG-REPORT-ADDRESS])
-+AC_CONFIG_AUX_DIR([scripts])
-+AM_INIT_AUTOMAKE
-+
-+LOCKDEV_CURRENT_INTERFACE=1
-+LOCKDEV_INTERFACE_AGE=0
-+LOCKDEV_BINARY_AGE=0
-+
-+AC_SUBST([LOCKDEV_CURRENT_INTERFACE])
-+AC_SUBST([LOCKDEV_INTERFACE_AGE])
-+AC_SUBST([LOCKDEV_BINARY_AGE])
-+
-+LT_INIT([disable-static])
-+
-+AC_CANONICAL_BUILD
-+AC_CANONICAL_HOST
-+
-+# Checks for programs.
-+AC_PROG_LN_S
-+
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
diff --git a/libs/lockdev/lockdev-1.0.3-fix-perl.patch
b/libs/lockdev/lockdev-1.0.3-fix-perl.patch
deleted file mode 100644
index 7b25f82..0000000
--- a/libs/lockdev/lockdev-1.0.3-fix-perl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lockdev-1.0.3.orig/LockDev/Makefile.PL
-+++ lockdev-1.0.3/LockDev/Makefile.PL
-@@ -7,7 +7,7 @@ WriteMakefile(
- 'LIBS' => [''],
- 'DEFINE' => '',
- 'INC' => '-I../src',
-- 'MYEXTLIB' => '../src/lockdev.z',
-+ 'MYEXTLIB' => '../.libs/liblockdev.so',
- );
-
- sub MY::postamble {
diff --git a/libs/lockdev/patches/0001-add-autotools.patch
b/libs/lockdev/patches/0001-add-autotools.patch
new file mode 100644
index 0000000..ddae39f
--- /dev/null
+++ b/libs/lockdev/patches/0001-add-autotools.patch
@@ -0,0 +1,55 @@
+Adds an autotools build system to fix the many issues with the custom build
+system (ignoring CC, CFLAGS, DESTDIR, not installing the .so file properly).
+
+Contributed by Nick Fortino (nfortino AT gmail.com) 2/1/2009
+
+Updated by Jonathan Callen <abcd AT gentoo.org> 2009-09-11
+
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,20 @@
++include_HEADERS = src/lockdev.h src/ttylock.h
++
++lib_LTLIBRARIES = liblockdev.la
++liblockdev_la_SOURCES = src/lockdev.c
++liblockdev_version = -version-info
$(LOCKDEV_CURRENT_INTERFACE):$(LOCKDEV_INTERFACE_AGE):$(LOCKDEV_BINARY_AGE)
++liblockdev_la_LDFLAGS = $(liblockdev_version)
++
++man_MANS = docs/lockdev.3
++
++manpage_links = \
++ dev_lock.3 \
++ dev_unlock.3 \
++ dev_relock.3 \
++ dev_testlock.3 \
++ liblockdev.3
++
++install-data-hook:
++ for page in $(manpage_links); do \
++ $(LN_S) -f lockdev.3 $(DESTDIR)$(man3dir)/$${page} ; \
++ done
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,22 @@
++AC_INIT([lockdev], [1.0.3], [BUG-REPORT-ADDRESS])
++AC_CONFIG_AUX_DIR([scripts])
++AM_INIT_AUTOMAKE
++
++LOCKDEV_CURRENT_INTERFACE=1
++LOCKDEV_INTERFACE_AGE=0
++LOCKDEV_BINARY_AGE=0
++
++AC_SUBST([LOCKDEV_CURRENT_INTERFACE])
++AC_SUBST([LOCKDEV_INTERFACE_AGE])
++AC_SUBST([LOCKDEV_BINARY_AGE])
++
++LT_INIT([disable-static])
++
++AC_CANONICAL_BUILD
++AC_CANONICAL_HOST
++
++# Checks for programs.
++AC_PROG_LN_S
++
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
diff --git a/libs/lockdev/patches/0002-fix-perl.patch
b/libs/lockdev/patches/0002-fix-perl.patch
new file mode 100644
index 0000000..319ae83
--- /dev/null
+++ b/libs/lockdev/patches/0002-fix-perl.patch
@@ -0,0 +1,11 @@
+--- a/LockDev/Makefile.PL
++++ b/LockDev/Makefile.PL
+@@ -7,7 +7,7 @@ WriteMakefile(
+ 'LIBS' => [''],
+ 'DEFINE' => '',
+ 'INC' => '-I../src',
+- 'MYEXTLIB' => '../src/lockdev.z',
++ 'MYEXTLIB' => '../.libs/liblockdev.so',
+ );
+
+ sub MY::postamble {
diff --git a/libs/lockdev/patches/0003-major-minor-macros.patch
b/libs/lockdev/patches/0003-major-minor-macros.patch
new file mode 100644
index 0000000..b6a31f2
--- /dev/null
+++ b/libs/lockdev/patches/0003-major-minor-macros.patch
@@ -0,0 +1,29 @@
+From: Ismael Luceno <ismael AT sourcemage.org>
+
+Fix MAJOR and MINOR macros on non-glibc linux systems.
+
+All known linux libc implementations provide `major' and `minor' macros in
the
+`<sys/sysmacros.h>' header.
+
+Upstream-Status: Pending
+
+--- a/src/lockdev.c
++++ b/src/lockdev.c
+@@ -123,13 +123,10 @@
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
+-#if defined (__GNU_LIBRARY__)
+-# include <sys/sysmacros.h>
+-# define MAJOR(dev) gnu_dev_major (dev)
+-# define MINOR(dev) gnu_dev_minor (dev)
+-#else
+-# error "put here a define for MAJOR and MINOR"
+-#endif
++
++#include <sys/sysmacros.h>
++#define MAJOR(dev) major(dev)
++#define MINOR(dev) minor(dev)
+
+ #include "lockdev.h"
+
diff --git a/utils/schroot/DEPENDS b/utils/schroot/DEPENDS
index f6e1c17..dcd2160 100755
--- a/utils/schroot/DEPENDS
+++ b/utils/schroot/DEPENDS
@@ -14,7 +14,5 @@ optional_depends linux-pam \
'--disable-pam' \
'PAM support' &&

-optional_depends 'gettext' \
- '--enable-nls' \
- '--disable-nls' \
- 'for Native Language Support'
+# XXX fails to build without gettext
+depends gettext --enable-nls
diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index 94c76f8..9a78517 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,3 +1,7 @@
+2021-02-17 Ismael Luceno <ismael AT iodev.co.uk>
+ * DEPENDS: Made gettext a hard dependency; fails to build otherwise
+ * PRE_BUILD, patches/0001-musl.patch: Fixed build against musl
+
2014-06-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.6.10

diff --git a/utils/schroot/PRE_BUILD b/utils/schroot/PRE_BUILD
index b67dd00..34436f0 100755
--- a/utils/schroot/PRE_BUILD
+++ b/utils/schroot/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches &&
sed -i '/chroot.h/ a\
#include "sbuild-chroot-block-device-base.h"
' sbuild/sbuild-chroot-facet-session-clonable.cc &&
diff --git a/utils/schroot/patches/0001-musl.patch
b/utils/schroot/patches/0001-musl.patch
new file mode 100644
index 0000000..51e40e4
--- /dev/null
+++ b/utils/schroot/patches/0001-musl.patch
@@ -0,0 +1,25 @@
+From 73936a423227aa78b7682bdd3edc20643763807b Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc AT pompel.me>
+Date: Wed, 19 Sep 2018 11:22:47 +0200
+Subject: [PATCH] musl
+
+---
+ sbuild/sbuild-feature.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sbuild/sbuild-feature.cc b/sbuild/sbuild-feature.cc
+index 5ac4725..9902db3 100644
+--- a/sbuild/sbuild-feature.cc
++++ b/sbuild/sbuild-feature.cc
+@@ -20,6 +20,8 @@
+
+ #include <iostream>
+
++#include <libintl.h>
++
+ #include "sbuild-feature.h"
+
+ using namespace sbuild;
+--
+2.19.0
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (332d84a789f7bb03cd1684cd12248182d757758a), Ismael Luceno, 02/17/2021

Archive powered by MHonArc 2.6.24.

Top of Page