summaryrefslogtreecommitdiffstats
path: root/archive
diff options
context:
space:
mode:
authorIsmael Luceno2019-08-30 21:59:20 +0200
committerIsmael Luceno2019-08-30 21:59:20 +0200
commitb6ebff83504a696911efec1ed38c0e0b63006114 (patch)
tree3dd3faa819e5a98763818a7227323b1a2bf1e73d /archive
parenta17a3eeeeeec87beaecfa2e8153a68f9c996cc8a (diff)
dar: Fix build against musl
Diffstat (limited to 'archive')
-rw-r--r--archive/dar/HISTORY1
-rwxr-xr-xarchive/dar/PRE_BUILD3
-rw-r--r--archive/dar/patches/musl-getopt.patch13
3 files changed, 17 insertions, 0 deletions
diff --git a/archive/dar/HISTORY b/archive/dar/HISTORY
index 47eea7471c..56685b722c 100644
--- a/archive/dar/HISTORY
+++ b/archive/dar/HISTORY
@@ -1,5 +1,6 @@
2019-08-30 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: updated spell to 2.6.5
+ * PRE_BUILD, patches/musl-getopt.patch: Fixed build against musl
2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/archive/dar/PRE_BUILD b/archive/dar/PRE_BUILD
new file mode 100755
index 0000000000..c230ad14bf
--- /dev/null
+++ b/archive/dar/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/archive/dar/patches/musl-getopt.patch b/archive/dar/patches/musl-getopt.patch
new file mode 100644
index 0000000000..c2d9478c82
--- /dev/null
+++ b/archive/dar/patches/musl-getopt.patch
@@ -0,0 +1,13 @@
+--- a/src/dar_suite/my_getopt_long.h
++++ b/src/dar_suite/my_getopt_long.h
+@@ -27,6 +27,10 @@
+ #ifndef MY_GETOPT_LONG_H
+ #define MY_GETOPT_LONG_H
+
++#if !defined(__GLIBC__) && defined(__linux__)
++extern int optreset; /* not defined by musl */
++#endif
++
+ // getopt may be declated in <unistd.h> on systems like FreeBSD.
+ // if you want to use libgnugetopt you need to include <getopt.h>
+ // on this system. Thus a conflict appear because the getopt is