From 2f8cf847db4271cf5b4c775fb9cb1910a6e9fdf0 Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sun, 9 Aug 2015 21:58:38 +0200 Subject: [PATCH 01/20] allow checking sha1 instead of md5 --- distribute.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/distribute.sh b/distribute.sh index dee95b7098..6af3f0066e 100755 --- a/distribute.sh +++ b/distribute.sh @@ -69,6 +69,12 @@ if [ "X$MD5SUM" == "X" ]; then fi fi +SHA1SUM=$(which sha1sum) +if [ "X$SHA1SUM" == "X" ]; then + echo "Error: you need sha1sum installed." + exit 1 +fi + WGET=$(which wget) if [ "X$WGET" == "X" ]; then WGET=$(which curl) @@ -543,9 +549,13 @@ function run_get_packages() { url="URL_$module" url=${!url} + md5="MD5_$module" md5=${!md5} + sha1="SHA1_$module" + sha1=${!sha1} + if [ ! -d "$BUILD_PATH/$module" ]; then try mkdir -p $BUILD_PATH/$module fi @@ -581,6 +591,17 @@ function run_get_packages() { error "Module $module have invalid md5, redownload." rm $filename fi + elif [ -n "$sha1" ]; then + # check if the sha1 is correct + current_sha1=$($SHA1SUM $filename | cut -d\ -f1) + if [ "X$current_sha1" == "X$sha1" ]; then + # correct, no need to download + do_download=0 + else + # invalid download, remove the file + error "Module $module have invalid sha1, redownload." + rm $filename + fi else do_download=0 fi From 59737749bfe83097ca7c6f4227631b7ee3093e7b Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Fri, 14 Aug 2015 03:11:02 +0200 Subject: [PATCH 02/20] add recipe to build libuuid --- recipes/libuuid/recipe.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 recipes/libuuid/recipe.sh diff --git a/recipes/libuuid/recipe.sh b/recipes/libuuid/recipe.sh new file mode 100755 index 0000000000..4885c2fce5 --- /dev/null +++ b/recipes/libuuid/recipe.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +VERSION_libuuid=${VERSION_libuuid:-1.0.3} +URL_libuuid=http://downloads.sourceforge.net/project/libuuid/libuuid-${VERSION_libuuid}.tar.gz +DEPS_libuuid=() +BUILD_libuuid=$BUILD_PATH/libuuid/$(get_directory $URL_libuuid) +RECIPE_libuuid=$RECIPES_PATH/libuuid + +function prebuild_libuuid() { + true +} + +function shouldbuild_libuuid() { + # if [ -f $BUILD_libuuid/build/lib/libuuid.la ]; then + # DO_BUILD=0 + # fi + true +} + +function build_libuuid() { + cd $BUILD_libuuid + + push_arm + try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_libuuid/build/ + try make install + libtool --finish $BUILD_libuuid/build/ + pop_arm +} + +function postbuild_libuuid() { + true +} From f139689b305fcedff117dfc1d1397c5de10e5ec0 Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Fri, 14 Aug 2015 03:11:54 +0200 Subject: [PATCH 03/20] add recipe to build the task binary --- distribute.sh | 2 + recipes/task/CMakeLists.txt.patch | 13 + recipes/task/Nibbler.h.patch | 10 + recipes/task/glob.c | 906 ++++++++++++++++++++++++++++++ recipes/task/glob.h | 105 ++++ recipes/task/recipe.sh | 60 ++ 6 files changed, 1096 insertions(+) create mode 100644 recipes/task/CMakeLists.txt.patch create mode 100644 recipes/task/Nibbler.h.patch create mode 100644 recipes/task/glob.c create mode 100644 recipes/task/glob.h create mode 100644 recipes/task/recipe.sh diff --git a/distribute.sh b/distribute.sh index 6af3f0066e..5bb0c655d3 100755 --- a/distribute.sh +++ b/distribute.sh @@ -41,6 +41,7 @@ ROOT_PATH="$(dirname $($PYTHON -c 'from __future__ import print_function; import RECIPES_PATH="$ROOT_PATH/recipes" BUILD_PATH="$ROOT_PATH/build" LIBS_PATH="$ROOT_PATH/build/libs" +BIN_PATH="$ROOT_PATH/build/bin" JAVACLASS_PATH="$ROOT_PATH/build/java" PACKAGES_PATH="${PACKAGES_PATH:-$ROOT_PATH/.packages}" SRC_PATH="$ROOT_PATH/src" @@ -399,6 +400,7 @@ function run_prepare() { test -d $PACKAGES_PATH || mkdir -p $PACKAGES_PATH test -d $BUILD_PATH || mkdir -p $BUILD_PATH test -d $LIBS_PATH || mkdir -p $LIBS_PATH + test -d $BIN_PATH || mkdir -p $BIN_PATH test -d $JAVACLASS_PATH || mkdir -p $JAVACLASS_PATH test -d $LIBLINK_PATH || mkdir -p $LIBLINK_PATH diff --git a/recipes/task/CMakeLists.txt.patch b/recipes/task/CMakeLists.txt.patch new file mode 100644 index 0000000000..5cc22de9e0 --- /dev/null +++ b/recipes/task/CMakeLists.txt.patch @@ -0,0 +1,13 @@ +--- a/src/CMakeLists.txt 2015-05-10 22:57:48.000000000 +0200 ++++ b/src/CMakeLists.txt 2015-08-14 02:22:27.020473858 +0200 +@@ -43,8 +43,10 @@ + text.cpp text.h + utf8.cpp utf8.h + util.cpp util.h ++ glob.c glob.h + wcwidth6.cpp) + ++add_library (glob glob.c) + add_library (task STATIC ${task_SRCS}) + add_executable (task_executable main.cpp) + add_executable (calc_executable calc.cpp) diff --git a/recipes/task/Nibbler.h.patch b/recipes/task/Nibbler.h.patch new file mode 100644 index 0000000000..daf881c124 --- /dev/null +++ b/recipes/task/Nibbler.h.patch @@ -0,0 +1,10 @@ +--- a/src/Nibbler.h 2015-05-10 22:57:49.000000000 +0200 ++++ b/src/Nibbler.h 2015-08-09 22:57:45.791057015 +0200 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + class Nibbler + { diff --git a/recipes/task/glob.c b/recipes/task/glob.c new file mode 100644 index 0000000000..3ada88f101 --- /dev/null +++ b/recipes/task/glob.c @@ -0,0 +1,906 @@ +/* + * Natanael Arndt, 2011: removed collate.h dependencies + * (my changes are trivial) + * + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Guido van Rossum. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); + +/* + * glob(3) -- a superset of the one defined in POSIX 1003.2. + * + * The [!...] convention to negate a range is supported (SysV, Posix, ksh). + * + * Optional extra services, controlled by flags not defined by POSIX: + * + * GLOB_QUOTE: + * Escaping convention: \ inhibits any special meaning the following + * character might have (except \ at end of string is retained). + * GLOB_MAGCHAR: + * Set in gl_flags if pattern contained a globbing character. + * GLOB_NOMAGIC: + * Same as GLOB_NOCHECK, but it will only append pattern if it did + * not contain any magic characters. [Used in csh style globbing] + * GLOB_ALTDIRFUNC: + * Use alternately specified directory access functions. + * GLOB_TILDE: + * expand ~user/foo to the /home/dir/of/user/foo + * GLOB_BRACE: + * expand {1,2}{a,b} to 1a 1b 2a 2b + * gl_matchc: + * Number of matches in the current invocation of glob. + */ + +/* + * Some notes on multibyte character support: + * 1. Patterns with illegal byte sequences match nothing - even if + * GLOB_NOCHECK is specified. + * 2. Illegal byte sequences in filenames are handled by treating them as + * single-byte characters with a value of the first byte of the sequence + * cast to wchar_t. + * 3. State-dependent encodings are not currently supported. + */ + +#include +#include + +#include +#include +#include +#include "glob.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#define DOLLAR '$' +#define DOT '.' +#define EOS '\0' +#define LBRACKET '[' +#define NOT '!' +#define QUESTION '?' +#define QUOTE '\\' +#define RANGE '-' +#define RBRACKET ']' +#define SEP '/' +#define STAR '*' +#define TILDE '~' +#define UNDERSCORE '_' +#define LBRACE '{' +#define RBRACE '}' +#define SLASH '/' +#define COMMA ',' + +#ifndef DEBUG + +#define M_QUOTE 0x8000000000ULL +#define M_PROTECT 0x4000000000ULL +#define M_MASK 0xffffffffffULL +#define M_CHAR 0x00ffffffffULL + +typedef uint_fast64_t Char; + +#else + +#define M_QUOTE 0x80 +#define M_PROTECT 0x40 +#define M_MASK 0xff +#define M_CHAR 0x7f + +typedef char Char; + +#endif + + +#define CHAR(c) ((Char)((c)&M_CHAR)) +#define META(c) ((Char)((c)|M_QUOTE)) +#define M_ALL META('*') +#define M_END META(']') +#define M_NOT META('!') +#define M_ONE META('?') +#define M_RNG META('-') +#define M_SET META('[') +#define ismeta(c) (((c)&M_QUOTE) != 0) + + +static int compare(const void *, const void *); +static int g_Ctoc(const Char *, char *, size_t); +static int g_lstat(Char *, struct stat *, glob_t *); +static DIR *g_opendir(Char *, glob_t *); +static const Char *g_strchr(const Char *, wchar_t); +#ifdef notdef +static Char *g_strcat(Char *, const Char *); +#endif +static int g_stat(Char *, struct stat *, glob_t *); +static int glob0(const Char *, glob_t *, size_t *); +static int glob1(Char *, glob_t *, size_t *); +static int glob2(Char *, Char *, Char *, Char *, glob_t *, size_t *); +static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, size_t *); +static int globextend(const Char *, glob_t *, size_t *); +static const Char * + globtilde(const Char *, Char *, size_t, glob_t *); +static int globexp1(const Char *, glob_t *, size_t *); +static int globexp2(const Char *, const Char *, glob_t *, int *, size_t *); +static int match(Char *, Char *, Char *); +#ifdef DEBUG +static void qprintf(const char *, Char *); +#endif + +int +glob(const char *pattern, int flags, int (*errfunc)(const char *, int), glob_t *pglob) +{ + const char *patnext; + size_t limit; + Char *bufnext, *bufend, patbuf[MAXPATHLEN], prot; + mbstate_t mbs; + wchar_t wc; + size_t clen; + + patnext = pattern; + if (!(flags & GLOB_APPEND)) { + pglob->gl_pathc = 0; + pglob->gl_pathv = NULL; + if (!(flags & GLOB_DOOFFS)) + pglob->gl_offs = 0; + } + if (flags & GLOB_LIMIT) { + limit = pglob->gl_matchc; + if (limit == 0) + limit = ARG_MAX; + } else + limit = 0; + pglob->gl_flags = flags & ~GLOB_MAGCHAR; + pglob->gl_errfunc = errfunc; + pglob->gl_matchc = 0; + + bufnext = patbuf; + bufend = bufnext + MAXPATHLEN - 1; + if (flags & GLOB_NOESCAPE) { + memset(&mbs, 0, sizeof(mbs)); + while (bufend - bufnext >= MB_CUR_MAX) { + clen = mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs); + if (clen == (size_t)-1 || clen == (size_t)-2) + return (GLOB_NOMATCH); + else if (clen == 0) + break; + *bufnext++ = wc; + patnext += clen; + } + } else { + /* Protect the quoted characters. */ + memset(&mbs, 0, sizeof(mbs)); + while (bufend - bufnext >= MB_CUR_MAX) { + if (*patnext == QUOTE) { + if (*++patnext == EOS) { + *bufnext++ = QUOTE | M_PROTECT; + continue; + } + prot = M_PROTECT; + } else + prot = 0; + clen = mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs); + if (clen == (size_t)-1 || clen == (size_t)-2) + return (GLOB_NOMATCH); + else if (clen == 0) + break; + *bufnext++ = wc | prot; + patnext += clen; + } + } + *bufnext = EOS; + + if (flags & GLOB_BRACE) + return globexp1(patbuf, pglob, &limit); + else + return glob0(patbuf, pglob, &limit); +} + +/* + * Expand recursively a glob {} pattern. When there is no more expansion + * invoke the standard globbing routine to glob the rest of the magic + * characters + */ +static int +globexp1(const Char *pattern, glob_t *pglob, size_t *limit) +{ + const Char* ptr = pattern; + int rv; + + /* Protect a single {}, for find(1), like csh */ + if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS) + return glob0(pattern, pglob, limit); + + while ((ptr = g_strchr(ptr, LBRACE)) != NULL) + if (!globexp2(ptr, pattern, pglob, &rv, limit)) + return rv; + + return glob0(pattern, pglob, limit); +} + + +/* + * Recursive brace globbing helper. Tries to expand a single brace. + * If it succeeds then it invokes globexp1 with the new pattern. + * If it fails then it tries to glob the rest of the pattern and returns. + */ +static int +globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv, size_t *limit) +{ + int i; + Char *lm, *ls; + const Char *pe, *pm, *pm1, *pl; + Char patbuf[MAXPATHLEN]; + + /* copy part up to the brace */ + for (lm = patbuf, pm = pattern; pm != ptr; *lm++ = *pm++) + continue; + *lm = EOS; + ls = lm; + + /* Find the balanced brace */ + for (i = 0, pe = ++ptr; *pe; pe++) + if (*pe == LBRACKET) { + /* Ignore everything between [] */ + for (pm = pe++; *pe != RBRACKET && *pe != EOS; pe++) + continue; + if (*pe == EOS) { + /* + * We could not find a matching RBRACKET. + * Ignore and just look for RBRACE + */ + pe = pm; + } + } + else if (*pe == LBRACE) + i++; + else if (*pe == RBRACE) { + if (i == 0) + break; + i--; + } + + /* Non matching braces; just glob the pattern */ + if (i != 0 || *pe == EOS) { + *rv = glob0(patbuf, pglob, limit); + return 0; + } + + for (i = 0, pl = pm = ptr; pm <= pe; pm++) + switch (*pm) { + case LBRACKET: + /* Ignore everything between [] */ + for (pm1 = pm++; *pm != RBRACKET && *pm != EOS; pm++) + continue; + if (*pm == EOS) { + /* + * We could not find a matching RBRACKET. + * Ignore and just look for RBRACE + */ + pm = pm1; + } + break; + + case LBRACE: + i++; + break; + + case RBRACE: + if (i) { + i--; + break; + } + /* FALLTHROUGH */ + case COMMA: + if (i && *pm == COMMA) + break; + else { + /* Append the current string */ + for (lm = ls; (pl < pm); *lm++ = *pl++) + continue; + /* + * Append the rest of the pattern after the + * closing brace + */ + for (pl = pe + 1; (*lm++ = *pl++) != EOS;) + continue; + + /* Expand the current pattern */ +#ifdef DEBUG + qprintf("globexp2:", patbuf); +#endif + *rv = globexp1(patbuf, pglob, limit); + + /* move after the comma, to the next string */ + pl = pm + 1; + } + break; + + default: + break; + } + *rv = 0; + return 0; +} + + + +/* + * expand tilde from the passwd file. + */ +static const Char * +globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob_t *pglob) +{ + struct passwd *pwd; + char *h; + const Char *p; + Char *b, *eb; + + if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE)) + return pattern; + + /* + * Copy up to the end of the string or / + */ + eb = &patbuf[patbuf_len - 1]; + for (p = pattern + 1, h = (char *) patbuf; + h < (char *)eb && *p && *p != SLASH; *h++ = *p++) + continue; + + *h = EOS; + + if (((char *) patbuf)[0] == EOS) { + /* + * handle a plain ~ or ~/ by expanding $HOME first (iff + * we're not running setuid or setgid) and then trying + * the password file + */ + if (issetugid() != 0 || + (h = getenv("HOME")) == NULL) { + if (((h = getlogin()) != NULL && + (pwd = getpwnam(h)) != NULL) || + (pwd = getpwuid(getuid())) != NULL) + h = pwd->pw_dir; + else + return pattern; + } + } + else { + /* + * Expand a ~user + */ + if ((pwd = getpwnam((char*) patbuf)) == NULL) + return pattern; + else + h = pwd->pw_dir; + } + + /* Copy the home directory */ + for (b = patbuf; b < eb && *h; *b++ = *h++) + continue; + + /* Append the rest of the pattern */ + while (b < eb && (*b++ = *p++) != EOS) + continue; + *b = EOS; + + return patbuf; +} + + +/* + * The main glob() routine: compiles the pattern (optionally processing + * quotes), calls glob1() to do the real pattern matching, and finally + * sorts the list (unless unsorted operation is requested). Returns 0 + * if things went well, nonzero if errors occurred. + */ +static int +glob0(const Char *pattern, glob_t *pglob, size_t *limit) +{ + const Char *qpatnext; + int err; + size_t oldpathc; + Char *bufnext, c, patbuf[MAXPATHLEN]; + + qpatnext = globtilde(pattern, patbuf, MAXPATHLEN, pglob); + oldpathc = pglob->gl_pathc; + bufnext = patbuf; + + /* We don't need to check for buffer overflow any more. */ + while ((c = *qpatnext++) != EOS) { + switch (c) { + case LBRACKET: + c = *qpatnext; + if (c == NOT) + ++qpatnext; + if (*qpatnext == EOS || + g_strchr(qpatnext+1, RBRACKET) == NULL) { + *bufnext++ = LBRACKET; + if (c == NOT) + --qpatnext; + break; + } + *bufnext++ = M_SET; + if (c == NOT) + *bufnext++ = M_NOT; + c = *qpatnext++; + do { + *bufnext++ = CHAR(c); + if (*qpatnext == RANGE && + (c = qpatnext[1]) != RBRACKET) { + *bufnext++ = M_RNG; + *bufnext++ = CHAR(c); + qpatnext += 2; + } + } while ((c = *qpatnext++) != RBRACKET); + pglob->gl_flags |= GLOB_MAGCHAR; + *bufnext++ = M_END; + break; + case QUESTION: + pglob->gl_flags |= GLOB_MAGCHAR; + *bufnext++ = M_ONE; + break; + case STAR: + pglob->gl_flags |= GLOB_MAGCHAR; + /* collapse adjacent stars to one, + * to avoid exponential behavior + */ + if (bufnext == patbuf || bufnext[-1] != M_ALL) + *bufnext++ = M_ALL; + break; + default: + *bufnext++ = CHAR(c); + break; + } + } + *bufnext = EOS; +#ifdef DEBUG + qprintf("glob0:", patbuf); +#endif + + if ((err = glob1(patbuf, pglob, limit)) != 0) + return(err); + + /* + * If there was no match we are going to append the pattern + * if GLOB_NOCHECK was specified or if GLOB_NOMAGIC was specified + * and the pattern did not contain any magic characters + * GLOB_NOMAGIC is there just for compatibility with csh. + */ + if (pglob->gl_pathc == oldpathc) { + if (((pglob->gl_flags & GLOB_NOCHECK) || + ((pglob->gl_flags & GLOB_NOMAGIC) && + !(pglob->gl_flags & GLOB_MAGCHAR)))) + return(globextend(pattern, pglob, limit)); + else + return(GLOB_NOMATCH); + } + if (!(pglob->gl_flags & GLOB_NOSORT)) + qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc, + pglob->gl_pathc - oldpathc, sizeof(char *), compare); + return(0); +} + +static int +compare(const void *p, const void *q) +{ + return(strcmp(*(char **)p, *(char **)q)); +} + +static int +glob1(Char *pattern, glob_t *pglob, size_t *limit) +{ + Char pathbuf[MAXPATHLEN]; + + /* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */ + if (*pattern == EOS) + return(0); + return(glob2(pathbuf, pathbuf, pathbuf + MAXPATHLEN - 1, + pattern, pglob, limit)); +} + +/* + * The functions glob2 and glob3 are mutually recursive; there is one level + * of recursion for each segment in the pattern that contains one or more + * meta characters. + */ +static int +glob2(Char *pathbuf, Char *pathend, Char *pathend_last, Char *pattern, + glob_t *pglob, size_t *limit) +{ + struct stat sb; + Char *p, *q; + int anymeta; + + /* + * Loop over pattern segments until end of pattern or until + * segment with meta character found. + */ + for (anymeta = 0;;) { + if (*pattern == EOS) { /* End of pattern? */ + *pathend = EOS; + if (g_lstat(pathbuf, &sb, pglob)) + return(0); + + if (((pglob->gl_flags & GLOB_MARK) && + pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) + || (S_ISLNK(sb.st_mode) && + (g_stat(pathbuf, &sb, pglob) == 0) && + S_ISDIR(sb.st_mode)))) { + if (pathend + 1 > pathend_last) + return (GLOB_ABORTED); + *pathend++ = SEP; + *pathend = EOS; + } + ++pglob->gl_matchc; + return(globextend(pathbuf, pglob, limit)); + } + + /* Find end of next segment, copy tentatively to pathend. */ + q = pathend; + p = pattern; + while (*p != EOS && *p != SEP) { + if (ismeta(*p)) + anymeta = 1; + if (q + 1 > pathend_last) + return (GLOB_ABORTED); + *q++ = *p++; + } + + if (!anymeta) { /* No expansion, do next segment. */ + pathend = q; + pattern = p; + while (*pattern == SEP) { + if (pathend + 1 > pathend_last) + return (GLOB_ABORTED); + *pathend++ = *pattern++; + } + } else /* Need expansion, recurse. */ + return(glob3(pathbuf, pathend, pathend_last, pattern, p, + pglob, limit)); + } + /* NOTREACHED */ +} + +static int +glob3(Char *pathbuf, Char *pathend, Char *pathend_last, + Char *pattern, Char *restpattern, + glob_t *pglob, size_t *limit) +{ + struct dirent *dp; + DIR *dirp; + int err; + char buf[MAXPATHLEN]; + + /* + * The readdirfunc declaration can't be prototyped, because it is + * assigned, below, to two functions which are prototyped in glob.h + * and dirent.h as taking pointers to differently typed opaque + * structures. + */ + struct dirent *(*readdirfunc)(); + + if (pathend > pathend_last) + return (GLOB_ABORTED); + *pathend = EOS; + errno = 0; + + if ((dirp = g_opendir(pathbuf, pglob)) == NULL) { + /* TODO: don't call for ENOENT or ENOTDIR? */ + if (pglob->gl_errfunc) { + if (g_Ctoc(pathbuf, buf, sizeof(buf))) + return (GLOB_ABORTED); + if (pglob->gl_errfunc(buf, errno) || + pglob->gl_flags & GLOB_ERR) + return (GLOB_ABORTED); + } + return(0); + } + + err = 0; + + /* Search directory for matching names. */ + if (pglob->gl_flags & GLOB_ALTDIRFUNC) + readdirfunc = pglob->gl_readdir; + else + readdirfunc = readdir; + while ((dp = (*readdirfunc)(dirp))) { + char *sc; + Char *dc; + wchar_t wc; + size_t clen; + mbstate_t mbs; + + /* Initial DOT must be matched literally. */ + if (dp->d_name[0] == DOT && *pattern != DOT) + continue; + memset(&mbs, 0, sizeof(mbs)); + dc = pathend; + sc = dp->d_name; + while (dc < pathend_last) { + clen = mbrtowc(&wc, sc, MB_LEN_MAX, &mbs); + if (clen == (size_t)-1 || clen == (size_t)-2) { + wc = *sc; + clen = 1; + memset(&mbs, 0, sizeof(mbs)); + } + if ((*dc++ = wc) == EOS) + break; + sc += clen; + } + if (!match(pathend, pattern, restpattern)) { + *pathend = EOS; + continue; + } + err = glob2(pathbuf, --dc, pathend_last, restpattern, + pglob, limit); + if (err) + break; + } + + if (pglob->gl_flags & GLOB_ALTDIRFUNC) + (*pglob->gl_closedir)(dirp); + else + closedir(dirp); + return(err); +} + + +/* + * Extend the gl_pathv member of a glob_t structure to accomodate a new item, + * add the new item, and update gl_pathc. + * + * This assumes the BSD realloc, which only copies the block when its size + * crosses a power-of-two boundary; for v7 realloc, this would cause quadratic + * behavior. + * + * Return 0 if new item added, error code if memory couldn't be allocated. + * + * Invariant of the glob_t structure: + * Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and + * gl_pathv points to (gl_offs + gl_pathc + 1) items. + */ +static int +globextend(const Char *path, glob_t *pglob, size_t *limit) +{ + char **pathv; + size_t i, newsize, len; + char *copy; + const Char *p; + + if (*limit && pglob->gl_pathc > *limit) { + errno = 0; + return (GLOB_NOSPACE); + } + + newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs); + pathv = pglob->gl_pathv ? + realloc((char *)pglob->gl_pathv, newsize) : + malloc(newsize); + if (pathv == NULL) { + if (pglob->gl_pathv) { + free(pglob->gl_pathv); + pglob->gl_pathv = NULL; + } + return(GLOB_NOSPACE); + } + + if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) { + /* first time around -- clear initial gl_offs items */ + pathv += pglob->gl_offs; + for (i = pglob->gl_offs + 1; --i > 0; ) + *--pathv = NULL; + } + pglob->gl_pathv = pathv; + + for (p = path; *p++;) + continue; + len = MB_CUR_MAX * (size_t)(p - path); /* XXX overallocation */ + if ((copy = malloc(len)) != NULL) { + if (g_Ctoc(path, copy, len)) { + free(copy); + return (GLOB_NOSPACE); + } + pathv[pglob->gl_offs + pglob->gl_pathc++] = copy; + } + pathv[pglob->gl_offs + pglob->gl_pathc] = NULL; + return(copy == NULL ? GLOB_NOSPACE : 0); +} + +/* + * pattern matching function for filenames. Each occurrence of the * + * pattern causes a recursion level. + */ +static int +match(Char *name, Char *pat, Char *patend) +{ + int ok, negate_range; + Char c, k; + + while (pat < patend) { + c = *pat++; + switch (c & M_MASK) { + case M_ALL: + if (pat == patend) + return(1); + do + if (match(name, pat, patend)) + return(1); + while (*name++ != EOS); + return(0); + case M_ONE: + if (*name++ == EOS) + return(0); + break; + case M_SET: + ok = 0; + if ((k = *name++) == EOS) + return(0); + if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS) + ++pat; + while (((c = *pat++) & M_MASK) != M_END) + if ((*pat & M_MASK) == M_RNG) { + if (CHAR(c) <= CHAR(k) && CHAR(k) <= CHAR(pat[1])) ok = 1; + pat += 2; + } else if (c == k) + ok = 1; + if (ok == negate_range) + return(0); + break; + default: + if (*name++ != c) + return(0); + break; + } + } + return(*name == EOS); +} + +/* Free allocated data belonging to a glob_t structure. */ +void +globfree(glob_t *pglob) +{ + size_t i; + char **pp; + + if (pglob->gl_pathv != NULL) { + pp = pglob->gl_pathv + pglob->gl_offs; + for (i = pglob->gl_pathc; i--; ++pp) + if (*pp) + free(*pp); + free(pglob->gl_pathv); + pglob->gl_pathv = NULL; + } +} + +static DIR * +g_opendir(Char *str, glob_t *pglob) +{ + char buf[MAXPATHLEN]; + + if (!*str) + strcpy(buf, "."); + else { + if (g_Ctoc(str, buf, sizeof(buf))) + return (NULL); + } + + if (pglob->gl_flags & GLOB_ALTDIRFUNC) + return((*pglob->gl_opendir)(buf)); + + return(opendir(buf)); +} + +static int +g_lstat(Char *fn, struct stat *sb, glob_t *pglob) +{ + char buf[MAXPATHLEN]; + + if (g_Ctoc(fn, buf, sizeof(buf))) { + errno = ENAMETOOLONG; + return (-1); + } + if (pglob->gl_flags & GLOB_ALTDIRFUNC) + return((*pglob->gl_lstat)(buf, sb)); + return(lstat(buf, sb)); +} + +static int +g_stat(Char *fn, struct stat *sb, glob_t *pglob) +{ + char buf[MAXPATHLEN]; + + if (g_Ctoc(fn, buf, sizeof(buf))) { + errno = ENAMETOOLONG; + return (-1); + } + if (pglob->gl_flags & GLOB_ALTDIRFUNC) + return((*pglob->gl_stat)(buf, sb)); + return(stat(buf, sb)); +} + +static const Char * +g_strchr(const Char *str, wchar_t ch) +{ + + do { + if (*str == ch) + return (str); + } while (*str++); + return (NULL); +} + +static int +g_Ctoc(const Char *str, char *buf, size_t len) +{ + mbstate_t mbs; + size_t clen; + + memset(&mbs, 0, sizeof(mbs)); + while (len >= MB_CUR_MAX) { + clen = wcrtomb(buf, *str, &mbs); + if (clen == (size_t)-1) + return (1); + if (*str == L'\0') + return (0); + str++; + buf += clen; + len -= clen; + } + return (1); +} + +#ifdef DEBUG +static void +qprintf(const char *str, Char *s) +{ + Char *p; + + (void)printf("%s:\n", str); + for (p = s; *p; p++) + (void)printf("%c", CHAR(*p)); + (void)printf("\n"); + for (p = s; *p; p++) + (void)printf("%c", *p & M_PROTECT ? '"' : ' '); + (void)printf("\n"); + for (p = s; *p; p++) + (void)printf("%c", ismeta(*p) ? '_' : ' '); + (void)printf("\n"); +} +#endif diff --git a/recipes/task/glob.h b/recipes/task/glob.h new file mode 100644 index 0000000000..351b6c46bb --- /dev/null +++ b/recipes/task/glob.h @@ -0,0 +1,105 @@ +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Guido van Rossum. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)glob.h 8.1 (Berkeley) 6/2/93 + * $FreeBSD$ + */ + +#ifndef _GLOB_H_ +#define _GLOB_H_ + +#include +#include + +#ifndef _SIZE_T_DECLARED +typedef __size_t size_t; +#define _SIZE_T_DECLARED +#endif + +struct stat; +typedef struct { + size_t gl_pathc; /* Count of total paths so far. */ + size_t gl_matchc; /* Count of paths matching pattern. */ + size_t gl_offs; /* Reserved at beginning of gl_pathv. */ + int gl_flags; /* Copy of flags parameter to glob. */ + char **gl_pathv; /* List of paths matching pattern. */ + /* Copy of errfunc parameter to glob. */ + int (*gl_errfunc)(const char *, int); + + /* + * Alternate filesystem access methods for glob; replacement + * versions of closedir(3), readdir(3), opendir(3), stat(2) + * and lstat(2). + */ + void (*gl_closedir)(void *); + struct dirent *(*gl_readdir)(void *); + void *(*gl_opendir)(const char *); + int (*gl_lstat)(const char *, struct stat *); + int (*gl_stat)(const char *, struct stat *); +} glob_t; + +#if __POSIX_VISIBLE >= 199209 +/* Believed to have been introduced in 1003.2-1992 */ +#define GLOB_APPEND 0x0001 /* Append to output from previous call. */ +#define GLOB_DOOFFS 0x0002 /* Use gl_offs. */ +#define GLOB_ERR 0x0004 /* Return on error. */ +#define GLOB_MARK 0x0008 /* Append / to matching directories. */ +#define GLOB_NOCHECK 0x0010 /* Return pattern itself if nothing matches. */ +#define GLOB_NOSORT 0x0020 /* Don't sort. */ +#define GLOB_NOESCAPE 0x2000 /* Disable backslash escaping. */ + +/* Error values returned by glob(3) */ +#define GLOB_NOSPACE (-1) /* Malloc call failed. */ +#define GLOB_ABORTED (-2) /* Unignored error. */ +#define GLOB_NOMATCH (-3) /* No match and GLOB_NOCHECK was not set. */ +#define GLOB_NOSYS (-4) /* Obsolete: source comptability only. */ +#endif /* __POSIX_VISIBLE >= 199209 */ + +#if __BSD_VISIBLE +#define GLOB_ALTDIRFUNC 0x0040 /* Use alternately specified directory funcs. */ +#define GLOB_BRACE 0x0080 /* Expand braces ala csh. */ +#define GLOB_MAGCHAR 0x0100 /* Pattern had globbing characters. */ +#define GLOB_NOMAGIC 0x0200 /* GLOB_NOCHECK without magic chars (csh). */ +#define GLOB_QUOTE 0x0400 /* Quote special chars with \. */ +#define GLOB_TILDE 0x0800 /* Expand tilde names from the passwd file. */ +#define GLOB_LIMIT 0x1000 /* limit number of returned paths */ + +/* source compatibility, these are the old names */ +#define GLOB_MAXPATH GLOB_LIMIT +#define GLOB_ABEND GLOB_ABORTED +#endif /* __BSD_VISIBLE */ + +__BEGIN_DECLS +int glob(const char *, int, int (*)(const char *, int), glob_t *); +void globfree(glob_t *); +__END_DECLS + +#endif /* !_GLOB_H_ */ diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh new file mode 100644 index 0000000000..cc5b9976a8 --- /dev/null +++ b/recipes/task/recipe.sh @@ -0,0 +1,60 @@ +#!/bin/bash + +VERSION_task=${VERSION_task:-2.4.4} +URL_task=http://taskwarrior.org/download/task-${VERSION_task}.tar.gz + +DEPS_task=(libuuid) # gnutls +sha1_task=e7e1336ed099f672b3d5971d6a221b72ed804ac6 +BUILD_task=$BUILD_PATH/task/$(get_directory $URL_task) +RECIPE_task=$RECIPES_PATH/task + +_src=$BUILD_task +_build=$BUILD_task/build_p4a +_pyroot=$(dirname `dirname $HOSTPYTHON`) + +function prebuild_task() { + # take the patch from the recipe + cd $_src + patch -p1 < $ROOT_PATH/recipes/task/CMakeLists.txt.patch + patch -p1 < $ROOT_PATH/recipes/task/Nibbler.h.patch + + cp $ROOT_PATH/recipes/task/glob.* $_src/src + + cd $_build + if [ ! -d android-cmake ] + then + git clone https://github.com/taka-no-me/android-cmake.git + fi + +} + + +#function shouldbuild_task() { +#} + +function build_task() { + + try mkdir -p $_build + cd $_build + + push_arm + + export ANDROID_NDK=$ANDROIDNDK + cmake -DCMAKE_TOOLCHAIN_FILE=android-cmake/android.toolchain.cmake \ + -DUUID_INCLUDE_DIR=$BUILD_libuuid/build/include \ + -DUUID_LIBRARY=$BUILD_libuuid/build/lib/libuuid.a \ + -DANDROID_NDK=$ANDROIDNDK \ + -DCMAKE_BUILD_TYPE=Release \ + -DANDROID_ABI="armeabi-v7a with NEON" \ + $_src + cmake --build . + + try make -j1 . + try cp -a $_build/src/{task,calc,lex} $LIBS_PATH + + pop_arm +} + +function postbuild_task() { + true +} From 80f31111839bbb43d7343ff98772af83b477d641 Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Fri, 14 Aug 2015 03:13:05 +0200 Subject: [PATCH 04/20] start a gnutls recipe --- distribute.sh | 1 + recipes/gnutls/recipe.sh | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100755 recipes/gnutls/recipe.sh diff --git a/distribute.sh b/distribute.sh index 5bb0c655d3..cd369f1478 100755 --- a/distribute.sh +++ b/distribute.sh @@ -139,6 +139,7 @@ function get_directory() { *.tgz) directory=$(basename $1 .tgz) ;; *.tar.bz2) directory=$(basename $1 .tar.bz2) ;; *.tbz2) directory=$(basename $1 .tbz2) ;; + *.tar.xz) directory=$(basename $1 .tar.xz) ;; *.zip) directory=$(basename $1 .zip) ;; *) error "Unknown file extension $1" diff --git a/recipes/gnutls/recipe.sh b/recipes/gnutls/recipe.sh new file mode 100755 index 0000000000..ca7b5aa27e --- /dev/null +++ b/recipes/gnutls/recipe.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +VERSION_gnutls=3.3.16 +URL_gnutls=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${VERSION_gnutls}.tar.xz +MD5_gnutls= +BUILD_gnutls=$BUILD_PATH/gnutls/$(get_directory $URL_gnutls) +RECIPE_gnutls=$RECIPES_PATH/gnutls + +function prebuild_gnutls() { + true +} + +function build_gnutls() { + cd $BUILD_gnutls + bash + push_arm + try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_gnutls/build/lib + try make install + pop_arm +} + +function postbuild_gnutls() { + true +} From 10d671d881ea02f69fba0e305f8b977a3f839a92 Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Fri, 14 Aug 2015 20:31:45 +0200 Subject: [PATCH 05/20] add fPIE and pie options to task build commands --- recipes/task/CMakeLists.txt.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/recipes/task/CMakeLists.txt.patch b/recipes/task/CMakeLists.txt.patch index 5cc22de9e0..4aee776da4 100644 --- a/recipes/task/CMakeLists.txt.patch +++ b/recipes/task/CMakeLists.txt.patch @@ -11,3 +11,13 @@ add_library (task STATIC ${task_SRCS}) add_executable (task_executable main.cpp) add_executable (calc_executable calc.cpp) +@@ -64,6 +64,9 @@ + set_property (TARGET calc_executable PROPERTY OUTPUT_NAME "calc") + set_property (TARGET lex_executable PROPERTY OUTPUT_NAME "lex") + ++set (CMAKE_CXX_FLAGS "-fPIE") ++set (CMAKE_EXE_LINKER_FLAGS "-pie") ++ + #SET(CMAKE_BUILD_TYPE gcov) + #SET(CMAKE_CXX_FLAGS_GCOV "--coverage") + #SET(CMAKE_C_FLAGS_GCOV "--coverage") From 11892ade7f4fac6b5d7211ca2618d65178a6f85b Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sat, 15 Aug 2015 00:14:32 +0200 Subject: [PATCH 06/20] tentative fix for task fix --- recipes/task/CMakeLists.txt.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/task/CMakeLists.txt.patch b/recipes/task/CMakeLists.txt.patch index 4aee776da4..a0c7de2b20 100644 --- a/recipes/task/CMakeLists.txt.patch +++ b/recipes/task/CMakeLists.txt.patch @@ -15,8 +15,8 @@ set_property (TARGET calc_executable PROPERTY OUTPUT_NAME "calc") set_property (TARGET lex_executable PROPERTY OUTPUT_NAME "lex") -+set (CMAKE_CXX_FLAGS "-fPIE") -+set (CMAKE_EXE_LINKER_FLAGS "-pie") ++set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fPIE") ++set (CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-pie") + #SET(CMAKE_BUILD_TYPE gcov) #SET(CMAKE_CXX_FLAGS_GCOV "--coverage") From 343fba83bddf9117f1ba401be86f3a89cbcab86c Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sat, 15 Aug 2015 00:45:46 +0200 Subject: [PATCH 07/20] again --- recipes/task/CMakeLists.txt.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/task/CMakeLists.txt.patch b/recipes/task/CMakeLists.txt.patch index a0c7de2b20..bf4bd7dbef 100644 --- a/recipes/task/CMakeLists.txt.patch +++ b/recipes/task/CMakeLists.txt.patch @@ -15,8 +15,8 @@ set_property (TARGET calc_executable PROPERTY OUTPUT_NAME "calc") set_property (TARGET lex_executable PROPERTY OUTPUT_NAME "lex") -+set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fPIE") -+set (CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-pie") ++set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fPIE) ++set (CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -pie) + #SET(CMAKE_BUILD_TYPE gcov) #SET(CMAKE_CXX_FLAGS_GCOV "--coverage") From a4e39efe4d090fe4790fa1bf7b5704e5b0b620f7 Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sat, 15 Aug 2015 00:53:23 +0200 Subject: [PATCH 08/20] tentative fix of task build --- recipes/task/CMakeLists.txt.patch | 3 --- recipes/task/recipe.sh | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/task/CMakeLists.txt.patch b/recipes/task/CMakeLists.txt.patch index bf4bd7dbef..c2a3d951f7 100644 --- a/recipes/task/CMakeLists.txt.patch +++ b/recipes/task/CMakeLists.txt.patch @@ -15,9 +15,6 @@ set_property (TARGET calc_executable PROPERTY OUTPUT_NAME "calc") set_property (TARGET lex_executable PROPERTY OUTPUT_NAME "lex") -+set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fPIE) -+set (CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -pie) -+ #SET(CMAKE_BUILD_TYPE gcov) #SET(CMAKE_CXX_FLAGS_GCOV "--coverage") #SET(CMAKE_C_FLAGS_GCOV "--coverage") diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh index cc5b9976a8..e8ab5ca21e 100644 --- a/recipes/task/recipe.sh +++ b/recipes/task/recipe.sh @@ -43,6 +43,8 @@ function build_task() { cmake -DCMAKE_TOOLCHAIN_FILE=android-cmake/android.toolchain.cmake \ -DUUID_INCLUDE_DIR=$BUILD_libuuid/build/include \ -DUUID_LIBRARY=$BUILD_libuuid/build/lib/libuuid.a \ + -DCMAKE_CXX_FLAGS="-fPIE" \ + -DCMAKE_EXE_LINKER_FLAGS="-pie" \ -DANDROID_NDK=$ANDROIDNDK \ -DCMAKE_BUILD_TYPE=Release \ -DANDROID_ABI="armeabi-v7a with NEON" \ From b50f9b1c0e52e38eb22bc9c4a7f23cdde6ea9424 Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sat, 15 Aug 2015 01:04:42 +0200 Subject: [PATCH 09/20] task recipe switch to -fPIC not PIE --- recipes/task/recipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh index e8ab5ca21e..6072abb7e3 100644 --- a/recipes/task/recipe.sh +++ b/recipes/task/recipe.sh @@ -43,7 +43,7 @@ function build_task() { cmake -DCMAKE_TOOLCHAIN_FILE=android-cmake/android.toolchain.cmake \ -DUUID_INCLUDE_DIR=$BUILD_libuuid/build/include \ -DUUID_LIBRARY=$BUILD_libuuid/build/lib/libuuid.a \ - -DCMAKE_CXX_FLAGS="-fPIE" \ + -DCMAKE_CXX_FLAGS="-fPIC" \ -DCMAKE_EXE_LINKER_FLAGS="-pie" \ -DANDROID_NDK=$ANDROIDNDK \ -DCMAKE_BUILD_TYPE=Release \ From 6df330351a3e70087789dfd6af6d515ea7a13504 Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sat, 15 Aug 2015 01:23:47 +0200 Subject: [PATCH 10/20] again --- recipes/task/recipe.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh index 6072abb7e3..2aeabdac45 100644 --- a/recipes/task/recipe.sh +++ b/recipes/task/recipe.sh @@ -43,8 +43,8 @@ function build_task() { cmake -DCMAKE_TOOLCHAIN_FILE=android-cmake/android.toolchain.cmake \ -DUUID_INCLUDE_DIR=$BUILD_libuuid/build/include \ -DUUID_LIBRARY=$BUILD_libuuid/build/lib/libuuid.a \ - -DCMAKE_CXX_FLAGS="-fPIC" \ - -DCMAKE_EXE_LINKER_FLAGS="-pie" \ + -DCMAKE_CXX_FLAGS=-fPIC \ + -DCMAKE_EXE_LINKER_FLAGS=-pie \ -DANDROID_NDK=$ANDROIDNDK \ -DCMAKE_BUILD_TYPE=Release \ -DANDROID_ABI="armeabi-v7a with NEON" \ From bde8697c507434e344a5cba5886260cc87e0af2a Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sun, 16 Aug 2015 01:52:22 +0200 Subject: [PATCH 11/20] remove bad patch that apparently prevented the thing to build --- recipes/task/CMakeLists.txt.patch | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipes/task/CMakeLists.txt.patch b/recipes/task/CMakeLists.txt.patch index c2a3d951f7..5cc22de9e0 100644 --- a/recipes/task/CMakeLists.txt.patch +++ b/recipes/task/CMakeLists.txt.patch @@ -11,10 +11,3 @@ add_library (task STATIC ${task_SRCS}) add_executable (task_executable main.cpp) add_executable (calc_executable calc.cpp) -@@ -64,6 +64,9 @@ - set_property (TARGET calc_executable PROPERTY OUTPUT_NAME "calc") - set_property (TARGET lex_executable PROPERTY OUTPUT_NAME "lex") - - #SET(CMAKE_BUILD_TYPE gcov) - #SET(CMAKE_CXX_FLAGS_GCOV "--coverage") - #SET(CMAKE_C_FLAGS_GCOV "--coverage") From 108f421aadf7cb5cc8d8970d7b8d9659088edbf5 Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sun, 16 Aug 2015 04:17:48 +0200 Subject: [PATCH 12/20] fix distribute.sh to untar .tar.xz too --- distribute.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/distribute.sh b/distribute.sh index cd369f1478..57f0c85909 100755 --- a/distribute.sh +++ b/distribute.sh @@ -660,16 +660,9 @@ function run_get_packages() { pfilename=$PACKAGES_PATH/$module/$filename info "Extract $pfilename" case $pfilename in - *.tar.gz|*.tgz ) - try tar xzf $pfilename - root_directory=$(basename $(try tar tzf $pfilename|head -n1)) - if [ "X$root_directory" != "X$directory" ]; then - mv $root_directory $directory - fi - ;; - *.tar.bz2|*.tbz2 ) - try tar xjf $pfilename - root_directory=$(basename $(try tar tjf $pfilename|head -n1)) + *.tar.gz|*.tgz|*.tar.bz2|*.tbz2|*.tar.xz ) + try tar xf $pfilename + root_directory=$(basename $(try tar tf $pfilename|head -n1)) if [ "X$root_directory" != "X$directory" ]; then mv $root_directory $directory fi From bf2cc02a0534ad2f99aef950d66c0682f48d3146 Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sun, 16 Aug 2015 04:18:55 +0200 Subject: [PATCH 13/20] add nettle dep for gnutls, add gnutls as dep for recipe --- recipes/gnutls/recipe.sh | 2 +- recipes/nettle/recipe.sh | 24 ++++++++++++++++++++++++ recipes/task/recipe.sh | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 recipes/nettle/recipe.sh diff --git a/recipes/gnutls/recipe.sh b/recipes/gnutls/recipe.sh index ca7b5aa27e..e6eb2ce63f 100755 --- a/recipes/gnutls/recipe.sh +++ b/recipes/gnutls/recipe.sh @@ -1,8 +1,8 @@ #!/bin/bash VERSION_gnutls=3.3.16 +DEPS_gnutls=(nettle) URL_gnutls=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${VERSION_gnutls}.tar.xz -MD5_gnutls= BUILD_gnutls=$BUILD_PATH/gnutls/$(get_directory $URL_gnutls) RECIPE_gnutls=$RECIPES_PATH/gnutls diff --git a/recipes/nettle/recipe.sh b/recipes/nettle/recipe.sh new file mode 100644 index 0000000000..39660030f7 --- /dev/null +++ b/recipes/nettle/recipe.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +VERSION_nettle=2.7.1 +URL_nettle=https://ftp.gnu.org/gnu/nettle/nettle-${VERSION_nettle}.tar.gz +BUILD_nettle=$BUILD_PATH/nettle/$(get_directory $URL_nettle) +RECIPE_nettle=$RECIPES_PATH/nettle + +function prebuild_nettle() { + true +} + +function build_nettle() { + cd $BUILD_nettle + push_arm + bash + try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_nettle/build/ + try make install + libtool --finish $BUILD_nettle/build/ + pop_arm +} + +function postbuild_nettle() { + true +} diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh index 2aeabdac45..fa366b442e 100644 --- a/recipes/task/recipe.sh +++ b/recipes/task/recipe.sh @@ -3,7 +3,7 @@ VERSION_task=${VERSION_task:-2.4.4} URL_task=http://taskwarrior.org/download/task-${VERSION_task}.tar.gz -DEPS_task=(libuuid) # gnutls +DEPS_task=(libuuid gnutls) # gnutls sha1_task=e7e1336ed099f672b3d5971d6a221b72ed804ac6 BUILD_task=$BUILD_PATH/task/$(get_directory $URL_task) RECIPE_task=$RECIPES_PATH/task From 40ac81992639b3803275955cad71484d0ee37d30 Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sun, 16 Aug 2015 16:06:34 +0200 Subject: [PATCH 14/20] small cleanup of task recipe --- recipes/task/recipe.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh index fa366b442e..2e494a3c06 100644 --- a/recipes/task/recipe.sh +++ b/recipes/task/recipe.sh @@ -15,10 +15,10 @@ _pyroot=$(dirname `dirname $HOSTPYTHON`) function prebuild_task() { # take the patch from the recipe cd $_src - patch -p1 < $ROOT_PATH/recipes/task/CMakeLists.txt.patch - patch -p1 < $ROOT_PATH/recipes/task/Nibbler.h.patch + patch -p1 < $RECIPE_task/CMakeLists.txt.patch + patch -p1 < $RECIPE_task/Nibbler.h.patch - cp $ROOT_PATH/recipes/task/glob.* $_src/src + cp $RECIPE_task/glob.* $_src/src cd $_build if [ ! -d android-cmake ] From c4e43493ffa174a25e90194b544d9f945f30b17f Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sun, 16 Aug 2015 16:07:08 +0200 Subject: [PATCH 15/20] remove call to bash in nettle recipe --- recipes/nettle/recipe.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/nettle/recipe.sh b/recipes/nettle/recipe.sh index 39660030f7..f64b320512 100644 --- a/recipes/nettle/recipe.sh +++ b/recipes/nettle/recipe.sh @@ -12,7 +12,6 @@ function prebuild_nettle() { function build_nettle() { cd $BUILD_nettle push_arm - bash try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_nettle/build/ try make install libtool --finish $BUILD_nettle/build/ From 12562ade8e8784fb31a57de76639b0224e5cfcce Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Mon, 17 Aug 2015 02:28:04 +0200 Subject: [PATCH 16/20] add libgmp recipe and fixes for nettle and gnutls recipe --- recipes/gnutls/recipe.sh | 18 ++++++++++++++++-- recipes/libgmp/recipe.sh | 30 ++++++++++++++++++++++++++++++ recipes/nettle/recipe.sh | 7 +++++++ 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 recipes/libgmp/recipe.sh diff --git a/recipes/gnutls/recipe.sh b/recipes/gnutls/recipe.sh index e6eb2ce63f..f34847b4b3 100755 --- a/recipes/gnutls/recipe.sh +++ b/recipes/gnutls/recipe.sh @@ -12,10 +12,24 @@ function prebuild_gnutls() { function build_gnutls() { cd $BUILD_gnutls - bash push_arm - try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_gnutls/build/lib + export PKG_CONFIG_PATH="$BUILD_nettle/build/lib/pkgconfig:$PKG_CONFIG_PATH" + OLD_LDFLAGS=$LDFLAGS + OLD_CPPFLAGS=$CPPFLAGS + + #echo $SHELL + #PS1='\w: ' $SHELL + + export CPPFLAGS="-I$BUILD_libgmp/build/include $CPPFLAGS -fexceptions -I${ANDROIDNDK}/sources/cxx-stl/stlport/stlport" + export LDFLAGS="-L$BUILD_libgmp/build/lib $LDFLAGS \ + $ANDROIDNDK/sources/cxx-stl/gnu-libstdc++/$TOOLCHAIN_VERSION/libs/$ARCH/libsupc++.a \ + $ANDROIDNDK/sources/cxx-stl/gnu-libstdc++/$TOOLCHAIN_VERSION/libs/$ARCH/libgnustl_static.a" + + try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_gnutls/build/ --enable-local-libopts --disable-doc --disable-tests try make install + + export LDFLAGS=$OLD_LDFLAGS + export CPPFLAGS=$OLD_CPPFLAGS pop_arm } diff --git a/recipes/libgmp/recipe.sh b/recipes/libgmp/recipe.sh new file mode 100644 index 0000000000..604b85b702 --- /dev/null +++ b/recipes/libgmp/recipe.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +VERSION_libgmp=${VERSION_libgmp:-6.0.0a} +URL_libgmp=https://gmplib.org/download/gmp/gmp-${VERSION_libgmp}.tar.xz +DEPS_libgmp=() +BUILD_libgmp=$BUILD_PATH/libgmp/$(get_directory $URL_libgmp) +RECIPE_libgmp=$RECIPES_PATH/libgmp + +function prebuild_libgmp() { + true +} + +function shouldbuild_libgmp() { + true +} + +function build_libgmp() { + cd $BUILD_libgmp + + push_arm + try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_libgmp/build/ + #try make check + try make install + libtool --finish $BUILD_libgmp/build/ + pop_arm +} + +function postbuild_libgmp() { + true +} diff --git a/recipes/nettle/recipe.sh b/recipes/nettle/recipe.sh index f64b320512..29ba262292 100644 --- a/recipes/nettle/recipe.sh +++ b/recipes/nettle/recipe.sh @@ -2,6 +2,7 @@ VERSION_nettle=2.7.1 URL_nettle=https://ftp.gnu.org/gnu/nettle/nettle-${VERSION_nettle}.tar.gz +DEPS_nettle=(libgmp) BUILD_nettle=$BUILD_PATH/nettle/$(get_directory $URL_nettle) RECIPE_nettle=$RECIPES_PATH/nettle @@ -12,9 +13,15 @@ function prebuild_nettle() { function build_nettle() { cd $BUILD_nettle push_arm + OLD_LDFLAGS=$LDFLAGS + OLD_CPPFLAGS=$CPPFLAGS + export LDFLAGS="-L$BUILD_libgmp/build/lib $LDFLAGS" + export CPPFLAGS="-I$BUILD_libgmp/build/include $CPPFLAGS" try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_nettle/build/ try make install libtool --finish $BUILD_nettle/build/ + export LDFLAGS=$OLD_LDFLAGS + export CPPFLAGS=$OLD_CPPFLAGS pop_arm } From e10167896609e14aa72223d420b8c14eb9d0164a Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Thu, 20 Aug 2015 19:20:23 +0200 Subject: [PATCH 17/20] =?UTF-8?q?nearly=20there=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- recipes/gnutls/recipe.sh | 3 +++ recipes/task/recipe.sh | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/recipes/gnutls/recipe.sh b/recipes/gnutls/recipe.sh index f34847b4b3..524dfaa272 100755 --- a/recipes/gnutls/recipe.sh +++ b/recipes/gnutls/recipe.sh @@ -22,11 +22,14 @@ function build_gnutls() { export CPPFLAGS="-I$BUILD_libgmp/build/include $CPPFLAGS -fexceptions -I${ANDROIDNDK}/sources/cxx-stl/stlport/stlport" export LDFLAGS="-L$BUILD_libgmp/build/lib $LDFLAGS \ + $NDKPLATFORM/usr/lib/libz.so \ + $BUILD_libgmp/build/lib/libgmp.a \ $ANDROIDNDK/sources/cxx-stl/gnu-libstdc++/$TOOLCHAIN_VERSION/libs/$ARCH/libsupc++.a \ $ANDROIDNDK/sources/cxx-stl/gnu-libstdc++/$TOOLCHAIN_VERSION/libs/$ARCH/libgnustl_static.a" try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_gnutls/build/ --enable-local-libopts --disable-doc --disable-tests try make install + libtool --finish $BUILD_gnutls/build/ export LDFLAGS=$OLD_LDFLAGS export CPPFLAGS=$OLD_CPPFLAGS diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh index 2e494a3c06..d15c3be9c8 100644 --- a/recipes/task/recipe.sh +++ b/recipes/task/recipe.sh @@ -40,18 +40,22 @@ function build_task() { push_arm export ANDROID_NDK=$ANDROIDNDK + export GNUTLS_LIBRARY=$BUILD_gnutls/build/lib/libgnutls.a + export GNUTLS_INCLUDE_DIR=$BUILD_gnutls/build/include cmake -DCMAKE_TOOLCHAIN_FILE=android-cmake/android.toolchain.cmake \ -DUUID_INCLUDE_DIR=$BUILD_libuuid/build/include \ -DUUID_LIBRARY=$BUILD_libuuid/build/lib/libuuid.a \ -DCMAKE_CXX_FLAGS=-fPIC \ - -DCMAKE_EXE_LINKER_FLAGS=-pie \ + -DGNUTLS_LIBRARY=$GNUTLS_LIBRARY \ + -DGNUTLS_INCLUDE_DIR=$GNUTLS_INCLUDE_DIR \ + -DCMAKE_EXE_LINKER_FLAGS="-pie -L$BUILD_nettle/build/lib/ -lhogweed -lz $(pkg-config --libs nettle) $BUILD_libgmp/build/lib/libgmp.a" \ -DANDROID_NDK=$ANDROIDNDK \ -DCMAKE_BUILD_TYPE=Release \ -DANDROID_ABI="armeabi-v7a with NEON" \ $_src cmake --build . - try make -j1 . + make -j1 . try cp -a $_build/src/{task,calc,lex} $LIBS_PATH pop_arm From 2898399acd5cd93972fa2989078f80dd0b4bc08d Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Thu, 27 Aug 2015 03:19:09 +0200 Subject: [PATCH 18/20] fix task compilation and linking! (ugly hack, but it works) --- recipes/nettle/recipe.sh | 9 ++++++++- recipes/task/recipe.sh | 9 +++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/recipes/nettle/recipe.sh b/recipes/nettle/recipe.sh index 29ba262292..614cb0637f 100644 --- a/recipes/nettle/recipe.sh +++ b/recipes/nettle/recipe.sh @@ -10,16 +10,23 @@ function prebuild_nettle() { true } +function shouldbuild_nettle() { + if [ -e "$LIBS_PATH/libhogweed.so" ]; then + DO_BUILD=0 + fi +} + function build_nettle() { cd $BUILD_nettle push_arm OLD_LDFLAGS=$LDFLAGS OLD_CPPFLAGS=$CPPFLAGS export LDFLAGS="-L$BUILD_libgmp/build/lib $LDFLAGS" - export CPPFLAGS="-I$BUILD_libgmp/build/include $CPPFLAGS" + export CPPFLAGS="-I$BUILD_libgmp/build/include" try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_nettle/build/ try make install libtool --finish $BUILD_nettle/build/ + try cp -L $BUILD_nettle/build/lib/*.so* $LIBS_PATH export LDFLAGS=$OLD_LDFLAGS export CPPFLAGS=$OLD_CPPFLAGS pop_arm diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh index d15c3be9c8..051090aadc 100644 --- a/recipes/task/recipe.sh +++ b/recipes/task/recipe.sh @@ -3,7 +3,7 @@ VERSION_task=${VERSION_task:-2.4.4} URL_task=http://taskwarrior.org/download/task-${VERSION_task}.tar.gz -DEPS_task=(libuuid gnutls) # gnutls +DEPS_task=(libuuid gnutls) sha1_task=e7e1336ed099f672b3d5971d6a221b72ed804ac6 BUILD_task=$BUILD_PATH/task/$(get_directory $URL_task) RECIPE_task=$RECIPES_PATH/task @@ -44,11 +44,12 @@ function build_task() { export GNUTLS_INCLUDE_DIR=$BUILD_gnutls/build/include cmake -DCMAKE_TOOLCHAIN_FILE=android-cmake/android.toolchain.cmake \ -DUUID_INCLUDE_DIR=$BUILD_libuuid/build/include \ - -DUUID_LIBRARY=$BUILD_libuuid/build/lib/libuuid.a \ + -DUUID_LIBRARY=$BUILD_libgmp/build/lib/libgmp.a \ + -DTASK_LIBRARIES=$BUILD_libuuid/build/lib/libuuid.a \ -DCMAKE_CXX_FLAGS=-fPIC \ - -DGNUTLS_LIBRARY=$GNUTLS_LIBRARY \ + -DGNUTLS_LIBRARY="$GNUTLS_LIBRARY" \ -DGNUTLS_INCLUDE_DIR=$GNUTLS_INCLUDE_DIR \ - -DCMAKE_EXE_LINKER_FLAGS="-pie -L$BUILD_nettle/build/lib/ -lhogweed -lz $(pkg-config --libs nettle) $BUILD_libgmp/build/lib/libgmp.a" \ + -DCMAKE_EXE_LINKER_FLAGS="-pie -L$BUILD_nettle/build/lib/ -lhogweed -lz $(pkg-config --libs nettle)" \ -DANDROID_NDK=$ANDROIDNDK \ -DCMAKE_BUILD_TYPE=Release \ -DANDROID_ABI="armeabi-v7a with NEON" \ From 6cf6f0c860cc48b8a363fd24a94ae78eb7380e0c Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sun, 11 Oct 2015 20:56:56 +0200 Subject: [PATCH 19/20] fixes to nettle build --- recipes/nettle/configure.patch | 21 +++++++++++++++++++++ recipes/nettle/recipe.sh | 4 ++++ recipes/task/recipe.sh | 19 +++++++++---------- 3 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 recipes/nettle/configure.patch diff --git a/recipes/nettle/configure.patch b/recipes/nettle/configure.patch new file mode 100644 index 0000000000..7456a66f22 --- /dev/null +++ b/recipes/nettle/configure.patch @@ -0,0 +1,21 @@ +--- a/configure 2015-10-02 21:38:50.590177998 +0200 ++++ b/configure 015-10-02 21:34:31.647035677 +0200 +@@ -5027,14 +5027,14 @@ + ;; + *) + LIBNETTLE_FORLINK=libnettle.so +- LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' +- LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)' ++ LIBNETTLE_SONAME='libnettle.$(LIBNETTLE_MAJOR)'.so ++ LIBNETTLE_FILE='libnettle.$(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR)'.so + LIBNETTLE_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$(LIBNETTLE_SONAME)' + LIBNETTLE_LIBS='' + + LIBHOGWEED_FORLINK=libhogweed.so +- LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' +- LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' ++ LIBHOGWEED_SONAME='libhogweed.$(LIBHOGWEED_MAJOR)'.so ++ LIBHOGWEED_FILE='libhogweed.$(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR)'.so + LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -Wl,-soname=$(LIBHOGWEED_SONAME)' + # Requested by debian, to make linking with only -lhogweed work + # (does not work in general, e.g., with static linking all of diff --git a/recipes/nettle/recipe.sh b/recipes/nettle/recipe.sh index 614cb0637f..9bbd559e2c 100644 --- a/recipes/nettle/recipe.sh +++ b/recipes/nettle/recipe.sh @@ -6,7 +6,11 @@ DEPS_nettle=(libgmp) BUILD_nettle=$BUILD_PATH/nettle/$(get_directory $URL_nettle) RECIPE_nettle=$RECIPES_PATH/nettle +_src=$BUILD_nettle + function prebuild_nettle() { + cd $_src + try patch -p1 < $RECIPE_nettle/configure.patch true } diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh index 051090aadc..2a3a3ad486 100644 --- a/recipes/task/recipe.sh +++ b/recipes/task/recipe.sh @@ -8,19 +8,18 @@ sha1_task=e7e1336ed099f672b3d5971d6a221b72ed804ac6 BUILD_task=$BUILD_PATH/task/$(get_directory $URL_task) RECIPE_task=$RECIPES_PATH/task -_src=$BUILD_task _build=$BUILD_task/build_p4a _pyroot=$(dirname `dirname $HOSTPYTHON`) function prebuild_task() { # take the patch from the recipe - cd $_src + cd $BUILD_task patch -p1 < $RECIPE_task/CMakeLists.txt.patch patch -p1 < $RECIPE_task/Nibbler.h.patch - cp $RECIPE_task/glob.* $_src/src + cp $RECIPE_task/glob.* $BUILD_task/src - cd $_build + cd $BUILD_task/build_p4a if [ ! -d android-cmake ] then git clone https://github.com/taka-no-me/android-cmake.git @@ -33,9 +32,8 @@ function prebuild_task() { #} function build_task() { - - try mkdir -p $_build - cd $_build + try mkdir -p $BUILD_task/build_p4a + cd $BUILD_task/build_p4a push_arm @@ -49,15 +47,16 @@ function build_task() { -DCMAKE_CXX_FLAGS=-fPIC \ -DGNUTLS_LIBRARY="$GNUTLS_LIBRARY" \ -DGNUTLS_INCLUDE_DIR=$GNUTLS_INCLUDE_DIR \ - -DCMAKE_EXE_LINKER_FLAGS="-pie -L$BUILD_nettle/build/lib/ -lhogweed -lz $(pkg-config --libs nettle)" \ + -DCMAKE_EXE_LINKER_FLAGS="-pie $(pkg-config --libs nettle hogweed) -lz" \ -DANDROID_NDK=$ANDROIDNDK \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ -DANDROID_ABI="armeabi-v7a with NEON" \ - $_src + $BUILD_task cmake --build . make -j1 . - try cp -a $_build/src/{task,calc,lex} $LIBS_PATH + try cp -a $BUILD_task/build_p4a/src/{task,calc,lex} $LIBS_PATH pop_arm } From ad77f62c68556acda8e42cd56850df35896b266e Mon Sep 17 00:00:00 2001 From: gabriel pettier Date: Sun, 8 Nov 2015 14:49:51 +0100 Subject: [PATCH 20/20] add patch flags for recipes, set pyasn1 dependency --- recipes/gnutls/recipe.sh | 2 +- recipes/nettle/recipe.sh | 8 ++++++-- recipes/task/recipe.sh | 9 +++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/recipes/gnutls/recipe.sh b/recipes/gnutls/recipe.sh index 524dfaa272..d536ff0a12 100755 --- a/recipes/gnutls/recipe.sh +++ b/recipes/gnutls/recipe.sh @@ -1,7 +1,7 @@ #!/bin/bash VERSION_gnutls=3.3.16 -DEPS_gnutls=(nettle) +DEPS_gnutls=(nettle pyasn1) URL_gnutls=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${VERSION_gnutls}.tar.xz BUILD_gnutls=$BUILD_PATH/gnutls/$(get_directory $URL_gnutls) RECIPE_gnutls=$RECIPES_PATH/gnutls diff --git a/recipes/nettle/recipe.sh b/recipes/nettle/recipe.sh index 9bbd559e2c..227350b0eb 100644 --- a/recipes/nettle/recipe.sh +++ b/recipes/nettle/recipe.sh @@ -10,8 +10,12 @@ _src=$BUILD_nettle function prebuild_nettle() { cd $_src - try patch -p1 < $RECIPE_nettle/configure.patch - true + if [ ! -e $RECIPE_nettle/patched ]; then + do + try patch -p1 < $RECIPE_nettle/configure.patch + touch $RECIPE_nettle/patched + done + fi } function shouldbuild_nettle() { diff --git a/recipes/task/recipe.sh b/recipes/task/recipe.sh index 2a3a3ad486..ce76d1f8f9 100644 --- a/recipes/task/recipe.sh +++ b/recipes/task/recipe.sh @@ -14,8 +14,13 @@ _pyroot=$(dirname `dirname $HOSTPYTHON`) function prebuild_task() { # take the patch from the recipe cd $BUILD_task - patch -p1 < $RECIPE_task/CMakeLists.txt.patch - patch -p1 < $RECIPE_task/Nibbler.h.patch + if [ ! -e $RECIPE_task/patched ]; then + do + patch --forward -p1 < $RECIPE_task/CMakeLists.txt.patch + patch --forward -p1 < $RECIPE_task/Nibbler.h.patch + touch $RECIPE_task/patched + done + fi cp $RECIPE_task/glob.* $BUILD_task/src pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy