diff options
| author | Michael Forney <mforney@mforney.org> | 2016-12-11 16:04:20 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-12-13 23:10:30 -0800 |
| commit | 293f5a93b77d92fd65db7f3d0df654f102e46cfb (patch) | |
| tree | 6ecd1170e3dd793862dd852814dc1b4cd5e44260 /pkg/msmtp/patch | |
| parent | 9a506a6834df01a26795cea222b410f206efa9fa (diff) | |
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
Diffstat (limited to 'pkg/msmtp/patch')
| -rw-r--r-- | pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch b/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch new file mode 100644 index 00000000..f2488fc9 --- /dev/null +++ b/pkg/msmtp/patch/0001-Use-_Static_assert-instead-of-checking-for-size-of-l.patch @@ -0,0 +1,40 @@ +From 5384637142de4c43b19ff069248f95e4b4d0ed8d Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Fri, 13 May 2016 23:01:44 -0700 +Subject: [PATCH] Use _Static_assert instead of checking for size of long long + +--- + configure.ac | 1 - + src/conf.c | 4 +--- + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 33ae887..db4b59c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -49,7 +49,6 @@ AC_CHECK_HEADERS([sysexits.h netdb.h arpa/inet.h sys/socket.h sys/wait.h]) + AC_CHECK_FUNCS([fmemopen fseeko fseeko64 getpass getservbyname link mkstemp strndup syslog vasprintf]) + AC_SEARCH_LIBS([nanosleep], [rt posix4]) + AC_SEARCH_LIBS([socket], [socket]) +-AC_CHECK_SIZEOF([long long]) + + dnl pkg-config (required to detect libraries) + PKG_PROG_PKG_CONFIG([]) +diff --git a/src/conf.c b/src/conf.c +index 875e51e..e471bea 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -36,9 +36,7 @@ + #include <ctype.h> + #include <errno.h> + +-#if (SIZEOF_LONG_LONG * CHAR_BIT) < 64 +-# error "long long has fewer than 64 bits" +-#endif ++_Static_assert(sizeof(long long) * CHAR_BIT >= 64, "long long has fewer than 64 bits"); + + #include "gettext.h" + #define _(string) gettext(string) +-- +2.10.2 + |