don't depend on host openssl headers installed, use our own,

standardize -- do i really need to mention it :)


git-svn-id: svn://svn.openwrt.org/openwrt/packages@4911 3c298f89-4303-0410-b956-a3cf2f4a3e73

net/squid/Makefile

@@ -12,149 +12,105 @@ PKG_NAME:=squid
 PKG_VERSION:=2.5.STABLE13
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v2/2.5/
 PKG_MD5SUM:=3e64468e123be1246d17486dab6bee87
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/squid
+define Package/squid/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libopenssl
+  URL:=http://www.squid-cache.org
+endef
+
+define Package/squid
+  $(call Package/squid/Default)
+  MENU:=1
+  DEPENDS:=+libopenssl +libpthread
   TITLE:=full-featured Web proxy cache
-  DESCRIPTION:=Squid is a high-performance proxy caching server for web clients, \\\
+  DESCRIPTION:=\
+	Squid is a high-performance proxy caching server for web clients, \\\
 	supporting FTP, gopher, and HTTP data objects. Unlike traditional \\\
 	caching software, Squid handles all requests in a single, \\\
 	non-blocking, I/O-driven process.
-  URL:=http://www.squid-cache.org
-  MENU:=1
 endef
 
 define Package/squid-mod-basic-auth-getpwnam
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=getpwnam basic authentication helper
 endef
 
 define Package/squid-mod-basic-auth-ncsa
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=NCSA basic authentication helper
 endef
 
 define Package/squid-mod-basic-auth-smb
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=Samba basic authentication helper
 endef
 
 define Package/squid-mod-basic-auth-winbind
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=Winbind basic authentication helper
 endef
 
 define Package/squid-mod-digest-auth-password
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=Password digest authentication helper
 endef
 
 define Package/squid-mod-external-acl-ip-user
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=IP user external ACL helper
 endef
 
 define Package/squid-mod-external-acl-unix-group
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=Unix group external ACL helper
 endef
 
 define Package/squid-mod-external-acl-winbind-group
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=Winbind group external ACL helper
 endef
 
 define Package/squid-mod-ntlm-auth-fakeauth
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=Fakeauth NTLM authentication helper
 endef
 
 define Package/squid-mod-ntlm-auth-smb-auth
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=Samba NTLM authentication helper
 endef
 
 define Package/squid-mod-ntlm-auth-winbind-auth
-  SECTION:=net
+  $(call Package/squid/Default)
-  CATEGORY:=Network
   DEPENDS:=squid
   TITLE:=Winbind NTLM authentication helper
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+	$(call Build/Configure/Default, \
-                $(TARGET_CONFIGURE_OPTS) \
-                CFLAGS="$(TARGET_CFLAGS)" \
-                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-                ac_cv_sizeof_void_p=4 \
-                ac_cv_sizeof_short=2 \
-                ac_cv_sizeof_int=4 \
-                ac_cv_sizeof_long=4 \
-                ac_cv_sizeof_long_long=8 \
-                ac_cv_sizeof___int64=0 \
-                ac_cv_sizeof_int16_t=2 \
-                ac_cv_sizeof_uint16_t=2 \
-                ac_cv_sizeof_u_int16_t=2 \
-                ac_cv_sizeof_int32_t=4 \
-                ac_cv_sizeof_uint32_t=4 \
-                ac_cv_sizeof_u_int32_t=4 \
-                ac_cv_sizeof_int64_t=8 \
-                ac_cv_sizeof_uint64_t=8 \
-                ac_cv_sizeof_u_int64_t=8 \
-                ac_cv_func_setresuid=no \
-                ac_cv_func_va_copy=no \
-                ac_cv_func___va_copy=no \
-                ./configure \
-                        --target=$(GNU_TARGET_NAME) \
-                        --host=$(GNU_TARGET_NAME) \
-                        --build=$(GNU_HOST_NAME) \
-                        --program-prefix="" \
-                        --program-suffix="" \
-                        --prefix=/usr \
-                        --exec-prefix=/usr \
-                        --bindir=/usr/bin \
 		--datadir=/usr/share/squid \
-                        --includedir=/usr/include \
-                        --infodir=/usr/share/info \
-                        --libdir=/usr/lib \
 		--libexecdir=/usr/lib/squid \
-                        --localstatedir=/var \
-                        --mandir=/usr/share/man \
-                        --sbindir=/usr/sbin \
 		--sysconfdir=/etc/squid \
-                        $(DISABLE_LARGEFILE) \
 		--enable-shared \
 		--enable-static \
 		--with-gnu-ld \
@@ -182,14 +138,35 @@ define Build/Configure
 		--enable-ntlm-auth-helpers="fakeauth SMB winbind" \
 		--enable-digest-auth-helpers="password" \
 		--enable-external-acl-helpers="ip_user unix_group winbind_group" \
-        );
+		, \
+		ac_cv_sizeof_void_p=4 \
+		ac_cv_sizeof_short=2 \
+		ac_cv_sizeof_int=4 \
+		ac_cv_sizeof_long=4 \
+		ac_cv_sizeof_long_long=8 \
+		ac_cv_sizeof___int64=0 \
+		ac_cv_sizeof_int16_t=2 \
+		ac_cv_sizeof_uint16_t=2 \
+		ac_cv_sizeof_u_int16_t=2 \
+		ac_cv_sizeof_int32_t=4 \
+		ac_cv_sizeof_uint32_t=4 \
+		ac_cv_sizeof_u_int32_t=4 \
+		ac_cv_sizeof_int64_t=8 \
+		ac_cv_sizeof_uint64_t=8 \
+		ac_cv_sizeof_u_int64_t=8 \
+		ac_cv_func_setresuid=no \
+		ac_cv_func_va_copy=no \
+		ac_cv_func___va_copy=no \
+        )
 endef
 	
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
+	# pass INCLUDES to compile host sources against our OpenSSL, not the host one
-	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR)/lib \
+		INCLUDES="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		all
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR=$(PKG_INSTALL_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef