Browse Source

Use gcc stack protector; Add remove_file function

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.0
falkTX 4 years ago
parent
commit
ddbff1317a
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 25 additions and 8 deletions
  1. +3
    -3
      bootstrap.sh
  2. +8
    -1
      build-jack.sh
  3. +3
    -4
      setup/env.sh
  4. +11
    -0
      setup/functions.sh

+ 3
- 3
bootstrap.sh View File

@@ -73,12 +73,12 @@ build_autoconf libogg "${LIBOGG_VERSION}"
# libvorbis

download libvorbis "${LIBVORBIS_VERSION}" "https://ftp.osuosl.org/pub/xiph/releases/vorbis"
build_autoconf libvorbis "${LIBVORBIS_VERSION}"
build_autoconf libvorbis "${LIBVORBIS_VERSION}" "--disable-examples"

# ---------------------------------------------------------------------------------------------------------------------
# flac

FLAC_EXTRAFLAGS="--disable-doxygen-docs --disable-thorough-tests"
FLAC_EXTRAFLAGS="--disable-doxygen-docs --disable-examples --disable-thorough-tests"

if [ "${MACOS_OLD}" -eq 1 ]; then
FLAC_EXTRAFLAGS="${FLAC_EXTRAFLAGS} --disable-asm-optimizations"
@@ -104,7 +104,7 @@ build_autoconf libsndfile "${LIBSNDFILE_VERSION}" "--disable-full-suite --disabl
# lv2

download lv2 "${LV2_VERSION}" "http://lv2plug.in/spec" "tar.bz2"
build_waf lv2 "${LV2_VERSION}" "--lv2dir=${PAWPAW_PREFIX}/lib/lv2"
build_waf lv2 "${LV2_VERSION}" "--lv2dir=${PAWPAW_PREFIX}/lib/lv2 --no-coverage --no-plugins"

# ---------------------------------------------------------------------------------------------------------------------
# fftw


+ 8
- 1
build-jack.sh View File

@@ -104,6 +104,13 @@ if [ "${WIN32}" -eq 1 ]; then
build_autoconf tre "${TRE_VERSION}" "--disable-nls"
fi

# ---------------------------------------------------------------------------------------------------------------------
# stop here if CI test build

if [ -n "${TRAVIS_BUILD_DIR}" ]; then
exit 0
fi

# ---------------------------------------------------------------------------------------------------------------------
# and finally jack2

@@ -113,7 +120,7 @@ fi

jack2_args="--prefix="${PAWPAW_PREFIX}/jack2""

# if [ "${MACOS_OLD}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then
# if [ "${MACOS_OLD}" -eq 1 ] || [ "${WIN64}" -eq 1 ]; then
# jack2_args="${jack2_args} --mixed"
# fi
# if [ "${WIN32}" -eq 1 ]; then


+ 3
- 4
setup/env.sh View File

@@ -44,8 +44,8 @@ PAWPAW_TMPDIR="/tmp"

BUILD_FLAGS="-O2 -pipe -I${PAWPAW_PREFIX}/include"
BUILD_FLAGS="${BUILD_FLAGS} -mtune=generic -msse -msse2 -mfpmath=sse -ffast-math"
BUILD_FLAGS="${BUILD_FLAGS} -fPIC -DPIC -DNDEBUG"
BUILD_FLAGS="${BUILD_FLAGS} -fdata-sections -ffunction-sections -fno-common -fvisibility=hidden"
BUILD_FLAGS="${BUILD_FLAGS} -fPIC -DPIC -DNDEBUG -D_FORTIFY_SOURCE=2"
BUILD_FLAGS="${BUILD_FLAGS} -fdata-sections -ffunction-sections -fno-common -fstack-protector -fvisibility=hidden"

if [ "${MACOS}" -eq 1 ]; then
if [ "${MACOS_OLD}" -eq 1 ]; then
@@ -56,7 +56,6 @@ if [ "${MACOS}" -eq 1 ]; then
fi
elif [ "${WIN32}" -eq 1 ]; then
BUILD_FLAGS="${BUILD_FLAGS} -DPTW32_STATIC_LIB -mstackrealign"
# -DWIN32_LEAN_AND_MEAN
fi
# -DFLUIDSYNTH_NOT_A_DLL

@@ -66,7 +65,7 @@ TARGET_CXXFLAGS="${BUILD_FLAGS} -fvisibility-inlines-hidden"
## link flags

LINK_FLAGS="-L${PAWPAW_PREFIX}/lib"
LINK_FLAGS="${LINK_FLAGS} -fdata-sections -ffunction-sections"
LINK_FLAGS="${LINK_FLAGS} -fdata-sections -ffunction-sections -fstack-protector"

if [ "${MACOS}" -eq 1 ]; then
LINK_FLAGS="${LINK_FLAGS} -Wl,-dead_strip -Wl,-dead_strip_dylibs"


+ 11
- 0
setup/functions.sh View File

@@ -378,4 +378,15 @@ function patch_file() {
sed -i -e "${rule}" "${pkgdir}/${file}"
}

function remove_file() {
local name="${1}"
local version="${2}"
local file="${3}"

local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}"

echo rm -f "${pkgdir}/${file}"
rm -f "${pkgdir}/${file}"
}

# ---------------------------------------------------------------------------------------------------------------------

Loading…
Cancel
Save