diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-10-01 03:37:22 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-10-01 03:37:22 (GMT) |
| commit | f966dd855fd8984f333cf7da3c7c137794e1f34c (patch) | |
| tree | bf0c6d296987c2e21b9ca77e1532c9fb8c5bdb96 /scripts/build/companion_libs | |
| parent | f86adab1f41b2320c20ffe2e9ffe0c6d12954c33 (diff) | |
| parent | ca45a8f9abd672189dbef5bcb242ac465df7b0f6 (diff) | |
Merge pull request #837 from stilor/download-verify
Verification of the downloads
Diffstat (limited to 'scripts/build/companion_libs')
| -rw-r--r-- | scripts/build/companion_libs/200-libelf.sh | 1 | ||||
| -rw-r--r-- | scripts/build/companion_libs/210-expat.sh | 3 | ||||
| -rw-r--r-- | scripts/build/companion_libs/220-ncurses.sh | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/scripts/build/companion_libs/200-libelf.sh b/scripts/build/companion_libs/200-libelf.sh index d1ac0b4..5f1a8d7 100644 --- a/scripts/build/companion_libs/200-libelf.sh +++ b/scripts/build/companion_libs/200-libelf.sh @@ -81,6 +81,7 @@ do_libelf_for_target() { libelf_opts+=( "destdir=${CT_SYSROOT_DIR}" ) libelf_opts+=( "host=${CT_TARGET}" ) + libelf_opts+=( "cflags=${CT_TARGET_CFLAGS}" ) libelf_opts+=( "prefix=${prefix}" ) libelf_opts+=( "shared=${CT_SHARED_LIBS}" ) do_libelf_backend "${libelf_opts[@]}" diff --git a/scripts/build/companion_libs/210-expat.sh b/scripts/build/companion_libs/210-expat.sh index dcb7208..f848541 100644 --- a/scripts/build/companion_libs/210-expat.sh +++ b/scripts/build/companion_libs/210-expat.sh @@ -54,6 +54,7 @@ do_expat_for_target() { prefix="/usr" ;; esac + expat_opts+=( "cflags=${CT_TARGET_CFLAGS}" ) expat_opts+=( "prefix=${prefix}" ) expat_opts+=( "destdir=${CT_SYSROOT_DIR}" ) expat_opts+=( "shared=${CT_SHARED_LIBS}" ) @@ -103,7 +104,7 @@ do_expat_backend() { CT_DoLog EXTRA "Building expat" CT_DoExecLog ALL make ${JOBSFLAGS} CT_DoLog EXTRA "Installing expat" - CT_DoExecLog ALL make install INSTALL_ROOT="${destdir}" + CT_DoExecLog ALL make install DESTDIR="${destdir}" } fi diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh index 815cf4b..a32df42 100644 --- a/scripts/build/companion_libs/220-ncurses.sh +++ b/scripts/build/companion_libs/220-ncurses.sh @@ -96,6 +96,7 @@ do_ncurses_for_target() { prefix="${prefix}" \ destdir="${CT_SYSROOT_DIR}" \ shared="${CT_SHARED_LIBS}" \ + cflags="${CT_TARGET_CFLAGS}" \ "${opts[@]}" CT_Popd CT_EndStep |