Changeset 16303 in niluje


Ignore:
Timestamp:
Aug 14, 2019, 2:46:44 AM (12 days ago)
Author:
NiLuJe
Message:

Kindle Hacks:

  • X-TC:
    • Oops, future-proof a few explicit Python rpaths that were missing the Py3 path…
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Configs/trunk/Kindle/Misc/x-compile.sh

    r16302 r16303  
    24822482fi
    24832483# Setup our Python rpath.
    2484 export LDFLAGS="${BASE_LDFLAGS} -Wl,-rpath=${DEVICE_USERSTORE}/python/lib"
     2484export LDFLAGS="${BASE_LDFLAGS} -Wl,-rpath=${DEVICE_USERSTORE}/python3/lib -Wl,-rpath=${DEVICE_USERSTORE}/python/lib"
    24852485# SQLite doesn't want to be built w/ -ffast-math...
    24862486export CFLAGS="${BASE_CFLAGS/-ffast-math /}"
     
    25772577patch -p1 < /usr/portage/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch
    25782578autoreconf -fi
    2579 export LDFLAGS="${BASE_LDFLAGS} -L. -Wl,-rpath=${DEVICE_USERSTORE}/python/lib"
     2579export LDFLAGS="${BASE_LDFLAGS} -Wl,-rpath=${DEVICE_USERSTORE}/python3/lib -Wl,-rpath=${DEVICE_USERSTORE}/python/lib"
    25802580if [[ "${SQLITE_WITH_ICU}" == "true" ]] ; then
    25812581        ./configure --prefix=${TC_BUILD_DIR} --host=${CROSS_TC} --disable-static --enable-shared --without-run-debug --without-mem-debug --without-lzma --disable-ipv6 --without-readline --without-history --without-python --with-icu
     
    26012601patch -p1 < /usr/portage/distfiles/libxslt-1.1.33-CVE-2019-11068.patch
    26022602autoreconf -fi
    2603 export LDFLAGS="${BASE_LDFLAGS} -L. -Wl,-rpath=${DEVICE_USERSTORE}/python/lib"
     2603export LDFLAGS="${BASE_LDFLAGS} -Wl,-rpath=${DEVICE_USERSTORE}/python3/lib -Wl,-rpath=${DEVICE_USERSTORE}/python/lib"
    26042604env ac_cv_path_ac_pt_XML_CONFIG=${TC_BUILD_DIR}/bin/xml2-config PKG_CONFIG="pkg-config --static" ./configure --prefix=${TC_BUILD_DIR} --host=${CROSS_TC} --disable-static --enable-shared --without-crypto --without-debug --without-mem-debug --without-python
    26052605make ${JOBSFLAGS} V=1
     
    43944394fi
    43954395# Setup our rpath...
    4396 export LDFLAGS="${BASE_LDFLAGS} -Wl,-rpath=${DEVICE_USERSTORE}/usbnet/lib -Wl,-rpath=${DEVICE_USERSTORE}/python/lib"
     4396export LDFLAGS="${BASE_LDFLAGS} -Wl,-rpath=${DEVICE_USERSTORE}/usbnet/lib -Wl,-rpath=${DEVICE_USERSTORE}/python3/lib -Wl,-rpath=${DEVICE_USERSTORE}/python/lib"
    43974397# Some bits and bobs appear to be ignoring CPPFLAGS...
    43984398export CFLAGS="${BASE_CPPFLAGS} ${BASE_CFLAGS}"
     
    44294429update_title_info
    44304430# Setup our rpath...
    4431 export LDFLAGS="${BASE_LDFLAGS} -Wl,-rpath=${DEVICE_USERSTORE}/usbnet/lib -Wl,-rpath=${DEVICE_USERSTORE}/python/lib"
     4431export LDFLAGS="${BASE_LDFLAGS} -Wl,-rpath=${DEVICE_USERSTORE}/usbnet/lib -Wl,-rpath=${DEVICE_USERSTORE}/python3/lib -Wl,-rpath=${DEVICE_USERSTORE}/python/lib"
    44324432./configure --prefix=${TC_BUILD_DIR} --host=${CROSS_TC} --enable-shared=no --enable-static=yes --disable-nls --with-system-zlib --enable-obsolete --enable-threads --enable-install-libiberty --disable-werror --disable-{gdb,libdecnumber,readline,sim} --without-stage1-ldflags
    44334433make ${JOBSFLAGS}
Note: See TracChangeset for help on using the changeset viewer.