summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/ImageMagick/Makefile3
-rwxr-xr-xpackage/base-files/src/sbin/adkupdate8
2 files changed, 9 insertions, 2 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 46abb9280..2f50ddf20 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -24,7 +24,7 @@ PKGSC_CONVERT:= multimedia
PKGSS_CONVERT:= libimagemagick
PKGSD_DISPLAY:= image display application
PKGSC_DISPLAY:= multimedia
-PKGSS_DISPLAY:= libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng
+PKGSS_DISPLAY:= libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng libltdl
PKGSB_DISPLAY:= libX11
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz
@@ -36,7 +36,6 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE
$(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT}))
$(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))
-TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ENV+= ac_cv_sys_file_offset_bits=yes
CONFIGURE_ARGS+= --with-magick-plus-plus=no \
diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate
index 619faf04f..b5477412f 100755
--- a/package/base-files/src/sbin/adkupdate
+++ b/package/base-files/src/sbin/adkupdate
@@ -89,6 +89,14 @@ case $1 in
;;
esac
+# fix permissions
+if [ -f /usr/bin/sudo ];then
+ chmod 4755 /usr/bin/sudo
+fi
+if [ -f /usr/bin/Xorg ];then
+ chmod 4755 /usr/bin/Xorg
+fi
+
sync
if [ -x /sbin/cfgfs ];then
umount /etc