Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config

4 files changed, 95 insertions, 0 deletions

diff --git a/pkg/libffi/fficonfig.h b/pkg/libffi/fficonfig.h
new file mode 100644
index 00000000..e49b5af1
--- /dev/null
+++ b/pkg/libffi/fficonfig.h
@@ -0,0 +1,68 @@
+#include <config-posix.h>
+
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+/* #undef CRAY_STACKSEG_END */
+/* #undef C_ALLOCA */
+#define EH_FRAME_FLAGS "aw"
+/* #undef FFI_DEBUG */
+/* #undef FFI_EXEC_TRAMPOLINE_TABLE */
+/* #undef FFI_MMAP_EXEC_EMUTRAMP_PAX */
+/* #undef FFI_MMAP_EXEC_WRIT */
+/* #undef FFI_NO_RAW_API */
+/* #undef FFI_NO_STRUCTS */
+#define HAVE_ALLOCA 1
+#define HAVE_ALLOCA_H 1
+#define HAVE_AS_ASCII_PSEUDO_OP 1
+#define HAVE_AS_CFI_PSEUDO_OP 1
+/* #undef HAVE_AS_REGISTER_PSEUDO_OP */
+/* #undef HAVE_AS_SPARC_UA_PCREL */
+#define HAVE_AS_STRING_PSEUDO_OP 1
+#define HAVE_AS_X86_64_UNWIND_SECTION_TYPE 1
+#define HAVE_AS_X86_PCREL 1
+#define HAVE_HIDDEN_VISIBILITY_ATTRIBUTE 1
+#define HAVE_LONG_DOUBLE 1
+/* #undef HAVE_LONG_DOUBLE_VARIANT */
+#define HAVE_MEMORY_H 1
+#define HAVE_MKOSTEMP 1
+#define HAVE_MMAP_ANON 1
+#define HAVE_MMAP_DEV_ZERO 1
+#define HAVE_MMAP_FILE 1
+/* #undef HAVE_RO_EH_FRAME */
+#define LT_OBJDIR ".libs/"
+#define PACKAGE "libffi"
+#define PACKAGE_BUGREPORT "http://github.com/atgreen/libffi/issues"
+#define PACKAGE_NAME "libffi"
+#define PACKAGE_STRING "libffi 3.2.1"
+#define PACKAGE_TARNAME "libffi"
+#define PACKAGE_URL ""
+#define PACKAGE_VERSION "3.2.1"
+#define SIZEOF_DOUBLE 8
+#define SIZEOF_LONG_DOUBLE 16
+#define SIZEOF_SIZE_T 8
+/* #undef STACK_DIRECTION */
+/* #undef SYMBOL_UNDERSCORE */
+/* #undef USING_PURIFY */
+#define VERSION "3.2.1"
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+/* #undef size_t */
+#ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE
+#ifdef LIBFFI_ASM
+#define FFI_HIDDEN(name) .hidden name
+#else
+#define FFI_HIDDEN __attribute__ ((visibility ("hidden")))
+#endif
+#else
+#ifdef LIBFFI_ASM
+#define FFI_HIDDEN(name)
+#else
+#define FFI_HIDDEN
+#endif
+#endif
diff --git a/pkg/libffi/gen.rc b/pkg/libffi/gen.rc
new file mode 100644
index 00000000..3c182720
--- /dev/null
+++ b/pkg/libffi/gen.rc
@@ -0,0 +1,26 @@
+cflags\
+	-I include\
+	-I '$dir' \
+	-I '$outdir'/include\
+	-I '$srcdir'/include
+
+build '$outdir'/include/ffi.h sed '$srcdir'/include/ffi.h.in ; exprs=(\
+	-e s,@VERSION@,3.2.1,\
+	-e s,@TARGET@,X86_64,\
+	-e s,@HAVE_LONG_DOUBLE@,1,\
+	-e s,@HAVE_LONG_DOUBLE_VARIANT@,0,\
+	-e s,@FFI_EXEC_TRAMPOLINE_TABLE@,0,\
+) with expr $"exprs
+build '$outdir'/include/ffitarget.h copy '$srcdir'/src/x86/ffitarget.h
+
+hdrs=include/^(ffi.h ffitarget.h)
+phony headers '$outdir'/$hdrs
+for(hdr in $hdrs) file $hdr '$outdir'/$hdr 644
+
+lib libffi.a -d '$dir'/headers src/^(\
+	prep_cif.c types.c raw_api.c java_raw_api.c closures.c\
+	x86/^(ffi64.c unix64.S ffi.c sysv.S)\
+)
+file lib/libffi.a '$outdir'/libffi.a 644
+
+fetch git
diff --git a/pkg/libffi/rev b/pkg/libffi/rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/pkg/libffi/rev
@@ -0,0 +1 @@
+1
diff --git a/pkg/libffi/src b/pkg/libffi/src
new file mode 160000
+Subproject 20562ac0427c3578250d04c6e34fb0127d4551c