From fc39e6e9ea049520c677641ca53664470fe199d9 Mon Sep 17 00:00:00 2001 From: mb Date: Thu, 27 Jan 2011 17:30:51 +0000 Subject: [PATCH] libSM, libXpm: dependency fixes git-svn-id: svn://svn.openwrt.org/openwrt/packages@25155 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Xorg/xorg/lib/libSM/Makefile | 4 ++-- Xorg/xorg/lib/libXpm/Makefile | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Xorg/xorg/lib/libSM/Makefile b/Xorg/xorg/lib/libSM/Makefile index bffc858a0..08dbd64c1 100644 --- a/Xorg/xorg/lib/libSM/Makefile +++ b/Xorg/xorg/lib/libSM/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libSM PKG_NAME:=libSM -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=1.1.1 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ @@ -27,7 +27,7 @@ define Package/libSM SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+libICE + DEPENDS:=+libICE +libuuid TITLE:=libSM URL:=http://xorg.freedesktop.org/ endef diff --git a/Xorg/xorg/lib/libXpm/Makefile b/Xorg/xorg/lib/libXpm/Makefile index c72be2427..05186d130 100644 --- a/Xorg/xorg/lib/libXpm/Makefile +++ b/Xorg/xorg/lib/libXpm/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXpm -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=3.5.8 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ @@ -26,11 +26,13 @@ define Package/libXpm SECTION:=xorg-libraries CATEGORY:=Xorg SUBMENU:=libraries - DEPENDS:=+libX11 +libXt +libXext + DEPENDS:=+libX11 +libXt +libXext +libSM TITLE:=libXpm URL:=http://xorg.freedesktop.org/ endef +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} $(CP) \