mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-09-29 15:41:20 +02:00
Code Issues

libreadline: cleanup Makefile, fix shlib perms

Browse Source 
Signed-off-by: Nicolas Thill <nico@openwrt.org>

SVN-Revision: 45223
This commit is contained in:
Nicolas Thill 2015-04-01 15:11:32 +00:00
parent d1457d5db4
commit 32085b22b0
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
package/libs/libreadline/Makefile
View File

@ -19,6 +19,8 @@ PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -38,27 +40,22 @@ define Package/libreadline/description
history expansion on previous commands. history expansion on previous commands.
endef endef
define Build/Configure # prevent "autoreconf" from removing "aclocal.m4"
$(CP) $(SCRIPT_DIR)/config.guess $(SCRIPT_DIR)/config.sub $(PKG_BUILD_DIR)/support/ PKG_REMOVE_FILES:=
$(call Build/Configure/Default, \
--enable-shared \ CONFIGURE_ARGS += \
--enable-static \ --enable-shared \
--without-curses \ --enable-static \
bash_cv_wcwidth_broken=no \ --with-curses \
bash_cv_func_sigsetjmp=yes \
) CONFIGURE_VARS += \
endef bash_cv_wcwidth_broken=no \
bash_cv_func_sigsetjmp=yes \
TARGET_CPPFLAGS:=-I. -I.. $(TARGET_CPPFLAGS) TARGET_CPPFLAGS:=-I. -I.. $(TARGET_CPPFLAGS)
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/

11
package/libs/libreadline/patches/001-install_perm.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/support/shlib-install
+++ b/support/shlib-install
@@ -73,7 +73,7 @@ fi
case "$host_os" in
hpux*|darwin*|macosx*|linux*|solaris2*)
if [ -z "$uninstall" ]; then
- chmod 555 ${INSTALLDIR}/${LIBNAME}
+ chmod +x ${INSTALLDIR}/${LIBNAME}
fi ;;
cygwin*|mingw*)
IMPLIBNAME=`echo ${LIBNAME} \