From 7a467e8942de54042e41b4b4d8e099c888db9ab8 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 6 Jun 2007 23:53:32 +0000 Subject: [PATCH] various minor package compilation issues git-svn-id: svn://svn.openwrt.org/openwrt/packages@7513 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/apr/Makefile | 2 +- libs/libjpeg/Makefile | 3 ++- net/nagios/Makefile | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 27bd72a08..5385939d9 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -72,7 +72,7 @@ define Build/InstallDev endef define Build/UninstallDev - rm $(STAGING_DIR)/usr/bin/apr-config \ + -rm $(STAGING_DIR)/usr/bin/apr-config \ $(STAGING_DIR)/usr/include/apr-0/{apr_allocator.h,apr_atomic.h,apr_compat.h,apr_dso.h,apr_env.h,apr_errno.h,apr_file_info.h,apr_file_io.h,apr_fnmatch.h,apr_general.h,apr_getopt.h,apr_global_mutex.h,apr.h,apr_hash.h,apr_inherit.h,apr_lib.h,apr_mmap.h,apr_network_io.h,apr_poll.h,apr_pools.h,apr_portable.h,\apr_proc_mutex.h,\apr_ring.h,apr_shm.h,apr_signal.h,apr_strings.h,apr_support.h,apr_tables.h,apr_thread_cond.h,apr_thread_mutex.h,apr_thread_proc.h,apr_thread_rwlock.h,apr_time.h,apr_user.h,apr_version.h,apr_want.h} \ $(STAGING_DIR)/usr/lib/libapr-0* \ $(STAGING_DIR)/usr/share/build/{apr_rules.mk,libtool,make_exports.awk,make_var_export.awk,mkdir.sh} diff --git a/libs/libjpeg/Makefile b/libs/libjpeg/Makefile index 586786d6e..4d5d62bce 100644 --- a/libs/libjpeg/Makefile +++ b/libs/libjpeg/Makefile @@ -66,7 +66,8 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ prefix="$(PKG_INSTALL_DIR)/usr" \ exec_prefix="$(PKG_INSTALL_DIR)/usr" \ - all install-headers install-lib install + all install-headers install-lib install \ + LIBTOOL="./libtool --tag=CC" endef define Build/InstallDev diff --git a/net/nagios/Makefile b/net/nagios/Makefile index 7f4a8c598..dada35bf9 100644 --- a/net/nagios/Makefile +++ b/net/nagios/Makefile @@ -38,7 +38,8 @@ endef define Build/Configure $(call Build/Configure/Default,\ --with-nagios-user="root" \ - --with-nagios-group="root" \ + --with-nagios-group="root", \ + LIBS="-lnotimpl" \ ) endef -- 2.11.0