From bef35f5a12ad435785fed9b8fec1a8459fdb0c15 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Oct 2016 09:58:28 +0100 Subject: atftp: fix musl compile --- package/atftp/patches/patch-Makefile_am | 11 ++ package/atftp/patches/patch-argz_h | 25 +++++ package/atftp/patches/patch-test_Makefile | 161 ++++++++++++++++++++++++++++++ package/atftp/patches/patch-tftp_h | 10 ++ package/atftp/patches/patch-tftpd_h | 10 ++ 5 files changed, 217 insertions(+) create mode 100644 package/atftp/patches/patch-Makefile_am create mode 100644 package/atftp/patches/patch-argz_h create mode 100644 package/atftp/patches/patch-test_Makefile create mode 100644 package/atftp/patches/patch-tftp_h create mode 100644 package/atftp/patches/patch-tftpd_h (limited to 'package/atftp') diff --git a/package/atftp/patches/patch-Makefile_am b/package/atftp/patches/patch-Makefile_am new file mode 100644 index 000000000..65d5ae2f9 --- /dev/null +++ b/package/atftp/patches/patch-Makefile_am @@ -0,0 +1,11 @@ +--- atftp-0.7.1.orig/Makefile.am 2012-07-22 09:20:32.000000000 +0200 ++++ atftp-0.7.1/Makefile.am 2016-10-19 20:02:20.000000000 +0200 +@@ -28,7 +28,7 @@ noinst_HEADERS = argz.h logger.h optio + tftpd.h tftpd_pcre.h tftpd_mtftp.h + + bin_PROGRAMS = atftp +-atftp_LDADD = $(LIBTERMCAP) $(LIBREADLINE) ++atftp_LDADD = $(LIBTERMCAP) $(LIBREADLINE) $(LIBPTHREAD) + atftp_SOURCES = tftp.c tftp_io.c logger.c options.c tftp_def.c tftp_file.c \ + argz.c tftp_mtftp.c + diff --git a/package/atftp/patches/patch-argz_h b/package/atftp/patches/patch-argz_h new file mode 100644 index 000000000..43f5d58dd --- /dev/null +++ b/package/atftp/patches/patch-argz_h @@ -0,0 +1,25 @@ +--- atftp-0.7.1.orig/argz.h 2011-03-11 07:51:24.000000000 +0100 ++++ atftp-0.7.1/argz.h 2016-10-19 20:02:27.000000000 +0200 +@@ -48,6 +48,22 @@ + # define __const const + #endif + ++#ifndef __THROW ++# define __THROW ++#endif ++ ++#ifndef __BEGIN_DECLS ++# define __BEGIN_DECLS ++#endif ++ ++#ifndef __END_DECLS ++# define __END_DECLS ++#endif ++ ++#ifndef __attribute_pure__ ++# define __attribute_pure__ ++#endif ++ + #ifndef __error_t_defined + typedef int error_t; + #endif diff --git a/package/atftp/patches/patch-test_Makefile b/package/atftp/patches/patch-test_Makefile new file mode 100644 index 000000000..e822102d1 --- /dev/null +++ b/package/atftp/patches/patch-test_Makefile @@ -0,0 +1,161 @@ +--- atftp-0.7.1.orig/test/Makefile 2012-09-04 07:32:19.000000000 +0200 ++++ atftp-0.7.1/test/Makefile 2016-10-19 19:16:36.000000000 +0200 +@@ -47,8 +47,8 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-build_triplet = x86_64-unknown-linux-gnu +-host_triplet = x86_64-unknown-linux-gnu ++build_triplet = x86_64-apple-darwin15.6.0 ++host_triplet = arm-openadk-linux-musleabihf + subdir = test + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -71,43 +71,43 @@ am__tty_colors_dummy = \ + am__color_tests=no + am__tty_colors = $(am__tty_colors_dummy) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /home/martin/swbuild/atftp/git/atftp/missing --run aclocal-1.12 ++ACLOCAL = ${SHELL} /Users/wbx/fluor/build_solidrun-imx6_musl_cortex_a9_hard_eabihf/w-atftp-0.7.1-1/atftp-0.7.1/missing --run aclocal-1.12 + AMTAR = $${TAR-tar} +-AUTOCONF = ${SHELL} /home/martin/swbuild/atftp/git/atftp/missing --run autoconf +-AUTOHEADER = ${SHELL} /home/martin/swbuild/atftp/git/atftp/missing --run autoheader +-AUTOMAKE = ${SHELL} /home/martin/swbuild/atftp/git/atftp/missing --run automake-1.12 ++AUTOCONF = ${SHELL} /Users/wbx/fluor/build_solidrun-imx6_musl_cortex_a9_hard_eabihf/w-atftp-0.7.1-1/atftp-0.7.1/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/wbx/fluor/build_solidrun-imx6_musl_cortex_a9_hard_eabihf/w-atftp-0.7.1-1/atftp-0.7.1/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/wbx/fluor/build_solidrun-imx6_musl_cortex_a9_hard_eabihf/w-atftp-0.7.1-1/atftp-0.7.1/missing --run automake-1.12 + AWK = gawk +-CC = gcc +-CCDEPMODE = depmode=gcc3 ++CC = /Users/wbx/fluor/toolchain_solidrun-imx6_musl_cortex_a9_hard_eabihf/usr/bin/arm-openadk-linux-musleabihf-gcc ++CCDEPMODE = depmode=none + CFLAGS = -g -Wall -D_REENTRANT -O2 +-CPP = gcc -E +-CPPFLAGS = ++CPP = /Users/wbx/fluor/toolchain_solidrun-imx6_musl_cortex_a9_hard_eabihf/usr/bin/arm-openadk-linux-musleabihf-gcc -E ++CPPFLAGS = -DNDEBUG + CYGPATH_W = echo + DEFS = -DHAVE_CONFIG_H + DEPDIR = .deps + ECHO_C = + ECHO_N = -n + ECHO_T = +-EGREP = /bin/grep -E ++EGREP = /opt/local/bin/grep -E + EXEEXT = +-GREP = /bin/grep +-INSTALL = /usr/bin/install -c ++GREP = /opt/local/bin/grep ++INSTALL = /Users/wbx/fluor/scripts/install -c + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_PROGRAM = ${INSTALL} + INSTALL_SCRIPT = ${INSTALL} + INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-ISODATE = 2012-09-04 +-LDFLAGS = ++ISODATE = 2016-10-19 ++LDFLAGS = -L/Users/wbx/fluor/target_solidrun-imx6_musl_cortex_a9_hard_eabihf/lib -L/Users/wbx/fluor/target_solidrun-imx6_musl_cortex_a9_hard_eabihf/usr/lib -Wl,-O1 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Users/wbx/fluor/target_solidrun-imx6_musl_cortex_a9_hard_eabihf/usr/lib + LIBOBJS = +-LIBPCRE = -lpcre ++LIBPCRE = + LIBPTHREAD = -lpthread +-LIBREADLINE = -lreadline ++LIBREADLINE = + LIBS = + LIBTERMCAP = +-LIBWRAP = -lnsl -lwrap ++LIBWRAP = + LTLIBOBJS = +-MAKEINFO = ${SHELL} /home/martin/swbuild/atftp/git/atftp/missing --run makeinfo +-MKDIR_P = /bin/mkdir -p ++MAKEINFO = ${SHELL} /Users/wbx/fluor/build_solidrun-imx6_musl_cortex_a9_hard_eabihf/w-atftp-0.7.1-1/atftp-0.7.1/missing --run makeinfo ++MKDIR_P = /opt/local/bin/gmkdir -p + OBJEXT = o + PACKAGE = atftp + PACKAGE_BUGREPORT = +@@ -117,58 +117,58 @@ PACKAGE_TARNAME = + PACKAGE_URL = + PACKAGE_VERSION = + PATH_SEPARATOR = : +-PLATFORM = unknown-x86_64-linux-gnu ++PLATFORM = openadk-arm-linux-musleabihf + SET_MAKE = +-SHELL = /bin/sh +-STRIP = ++SHELL = /opt/local/bin/bash ++STRIP = /Users/wbx/fluor/toolchain_solidrun-imx6_musl_cortex_a9_hard_eabihf/usr/bin/arm-openadk-linux-musleabihf-strip + VERSION = 0.7.1 +-abs_builddir = /home/martin/swbuild/atftp/git/atftp/test +-abs_srcdir = /home/martin/swbuild/atftp/git/atftp/test +-abs_top_builddir = /home/martin/swbuild/atftp/git/atftp +-abs_top_srcdir = /home/martin/swbuild/atftp/git/atftp +-ac_ct_CC = gcc ++abs_builddir = /Users/wbx/fluor/build_solidrun-imx6_musl_cortex_a9_hard_eabihf/w-atftp-0.7.1-1/atftp-0.7.1/test ++abs_srcdir = /Users/wbx/fluor/build_solidrun-imx6_musl_cortex_a9_hard_eabihf/w-atftp-0.7.1-1/atftp-0.7.1/test ++abs_top_builddir = /Users/wbx/fluor/build_solidrun-imx6_musl_cortex_a9_hard_eabihf/w-atftp-0.7.1-1/atftp-0.7.1 ++abs_top_srcdir = /Users/wbx/fluor/build_solidrun-imx6_musl_cortex_a9_hard_eabihf/w-atftp-0.7.1-1/atftp-0.7.1 ++ac_ct_CC = + am__include = include + am__leading_dot = . + am__quote = + am__tar = $${TAR-tar} chof - "$$tardir" + am__untar = $${TAR-tar} xf - +-bindir = ${exec_prefix}/bin +-build = x86_64-unknown-linux-gnu +-build_alias = ++bindir = /usr/bin ++build = x86_64-apple-darwin15.6.0 ++build_alias = x86_64-apple-darwin15.6.0 + build_cpu = x86_64 +-build_os = linux-gnu +-build_vendor = unknown ++build_os = darwin15.6.0 ++build_vendor = apple + builddir = . +-datadir = ${datarootdir} ++datadir = /usr/share + datarootdir = ${prefix}/share + docdir = ${datarootdir}/doc/${PACKAGE} + dvidir = ${docdir} + exec_prefix = ${prefix} +-host = x86_64-unknown-linux-gnu +-host_alias = +-host_cpu = x86_64 +-host_os = linux-gnu +-host_vendor = unknown ++host = arm-openadk-linux-musleabihf ++host_alias = arm-openadk-linux-musleabihf ++host_cpu = arm ++host_os = linux-musleabihf ++host_vendor = openadk + htmldir = ${docdir} + includedir = ${prefix}/include + infodir = ${datarootdir}/info +-install_sh = ${SHELL} /home/martin/swbuild/atftp/git/atftp/install-sh ++install_sh = ${SHELL} /Users/wbx/fluor/build_solidrun-imx6_musl_cortex_a9_hard_eabihf/w-atftp-0.7.1-1/atftp-0.7.1/install-sh + libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec ++libexecdir = /usr/libexec + localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man ++localstatedir = /var ++mandir = /usr/share/man + mkdir_p = $(MKDIR_P) + oldincludedir = /usr/include + pdfdir = ${docdir} +-prefix = /usr/local +-program_transform_name = s,x,x, ++prefix = /usr ++program_transform_name = s&$$&&;s&^&& + psdir = ${docdir} + sbindir = ${exec_prefix}/sbin + sharedstatedir = ${prefix}/com + srcdir = . +-sysconfdir = ${prefix}/etc +-target_alias = ++sysconfdir = /etc ++target_alias = arm-openadk-linux-musleabihf + top_build_prefix = ../ + top_builddir = .. + top_srcdir = .. diff --git a/package/atftp/patches/patch-tftp_h b/package/atftp/patches/patch-tftp_h new file mode 100644 index 000000000..dffeecb31 --- /dev/null +++ b/package/atftp/patches/patch-tftp_h @@ -0,0 +1,10 @@ +--- atftp-0.7.1.orig/tftp.h 2011-03-11 07:51:24.000000000 +0100 ++++ atftp-0.7.1/tftp.h 2016-10-19 20:02:34.000000000 +0200 +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include "tftp_def.h" + #include "config.h" + diff --git a/package/atftp/patches/patch-tftpd_h b/package/atftp/patches/patch-tftpd_h new file mode 100644 index 000000000..3e1c1fd6b --- /dev/null +++ b/package/atftp/patches/patch-tftpd_h @@ -0,0 +1,10 @@ +--- atftp-0.7.1.orig/tftpd.h 2011-03-11 07:51:24.000000000 +0100 ++++ atftp-0.7.1/tftpd.h 2016-10-19 20:02:34.000000000 +0200 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include "tftp_io.h" + + /* -- cgit v1.2.3