Merge pull request #3658 from MilhouseVH/le92_fix_symlink_fixups

buildsystem: fix symbolic link fixups [backport]

packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk

@@ -26,16 +26,14 @@ pre_configure_target() {
   export ac_cv_path_LIBUSB_CONFIG=$SYSROOT_PREFIX/usr/bin/libusb-config
 }
 
-post_make_target() {
+makeinstall_target() {
   # copy necessary libs and headers to build serdisplib support
   # into the driver glcd from lcdproc
   mkdir -p $SYSROOT_PREFIX/usr/include/serdisplib
   cp include/serdisplib/*.h $SYSROOT_PREFIX/usr/include/serdisplib
   mkdir -p $SYSROOT_PREFIX/usr/lib
   cp lib/libserdisp.so* $SYSROOT_PREFIX/usr/lib
-}
 
-makeinstall_target() {
   mkdir -p $INSTALL/usr/lib
   cp lib/libserdisp.so* $INSTALL/usr/lib
 }

packages/graphics/bcm2835-driver/package.mk

@@ -19,7 +19,7 @@ else
   PKG_FLOAT="hardfp"
 fi
 
-make_target() {
+makeinstall_target() {
   # Install vendor header files
   mkdir -p ${SYSROOT_PREFIX}/usr/include
     if [ "${OPENGLES}" = "bcm2835-driver" ]; then
@@ -57,9 +57,7 @@ make_target() {
   mkdir -p ${SYSROOT_PREFIX}/opt/vc
     ln -sf ${SYSROOT_PREFIX}/usr/lib     ${SYSROOT_PREFIX}/opt/vc/lib
     ln -sf ${SYSROOT_PREFIX}/usr/include ${SYSROOT_PREFIX}/opt/vc/include
-}
 
-makeinstall_target() {
   # Install EGL, OpenGL ES and other vendor libs
   mkdir -p ${INSTALL}/usr/lib
     if [ "${OPENGLES}" = "bcm2835-driver" ]; then

scripts/build

@@ -430,8 +430,9 @@ for i in $(find "${SYSROOT_PREFIX}/usr"/{lib,share} -type f -name "*.cmake" 2>/d
 done
 for i in $(find "${SYSROOT_PREFIX}" -type l 2>/dev/null); do
   _tmp="$(readlink -m "${i}")"
+  [[ ${_tmp} =~ ^/usr ]] && _tmp="${SYSROOT_PREFIX}${_tmp}"
   if [[ ${_tmp} =~ ^${SYSROOT_PREFIX}/ ]]; then
-    ln -sf "${_tmp/${SYSROOT_PREFIX}\//${PKG_ORIG_SYSROOT_PREFIX}\/}" "${i}"
+    ln -sfn "${_tmp/${SYSROOT_PREFIX}\//${PKG_ORIG_SYSROOT_PREFIX}\/}" "${i}"
   fi
 done