From 0c25e79a45e672bd2a5b8d66074bfb78c178c76d Mon Sep 17 00:00:00 2001 From: wittinobi Date: Sat, 22 Feb 2014 22:51:09 +0100 Subject: [PATCH] remove openssl config option, add some fixes --- config | 5 ----- make/drivers.mk | 2 +- make/neutrino.mk | 7 +------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/config b/config index a6e8fe9..eeeef93 100755 --- a/config +++ b/config @@ -56,11 +56,6 @@ CST_DRIVER_VERSION=master ### PART 2 # LIBRARIES # OPTIONAL ######################################################### ########################################################################################### -# if you want to build openssl (optional), define OPENSSL=yes: -# OPENSSL=yes -# OPENSSL=no -OPENSSL=no - # if you want to build libsigc++ (optional), define LIBSIGC=yes: # LIBSIGC=yes # LIBSIGC=no diff --git a/make/drivers.mk b/make/drivers.mk index ea93ce0..cbc536d 100755 --- a/make/drivers.mk +++ b/make/drivers.mk @@ -41,7 +41,7 @@ $(D)/realtek-wireless-kernel-2.6.35.14-cnxt: $(D)/coolstream-kernel-2.6.35.14-cn $(D)/realtek-wireless-kernel-2.6.39.4-cnxt: $(D)/coolstream-kernel-2.6.39.4-cnxt $(D)/wpa_supplicant | $(TARGETPREFIX) touch $@ -$(D)/wpa_supplicant: $(ARCHIVE)/wpa_supplicant-0.7.3.tar.gz | $(TARGETPREFIX) +$(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/wpa_supplicant-0.7.3.tar.gz | $(TARGETPREFIX) $(UNTAR)/wpa_supplicant-0.7.3.tar.gz pushd $(BUILD_TMP)/wpa_supplicant-0.7.3/wpa_supplicant && \ cp -f defconfig .config && \ diff --git a/make/neutrino.mk b/make/neutrino.mk index 8a4e869..0692adf 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -67,15 +67,10 @@ $(TARGETPREFIX)/.version: $(TARGETPREFIX)/bin/neutrino echo "builddate=`cd $(SOURCE_DIR)/neutrino-hd && git log | grep "^commit" | wc -l` vom `date --reference=$(SOURCE_DIR)/neutrino-hd/.git`" >> $@ $(D)/neutrino-hd-libs: - if [ $(OPENSSL) = "yes" ]; then \ - $(MAKE) $(D)/openssl; \ - else \ - true; \ - fi if [ $(LIBSIGC) = "yes" ]; then \ $(MAKE) $(D)/libsigc; \ else \ true; \ fi - $(MAKE) $(D)/libmad $(D)/libid3tag $(D)/libungif $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libboost $(D)/dvbsi $(D)/libflac $(D)/ffmpeg $(D)/libvorbis $(D)/openthreads $(D)/luaposix + $(MAKE) $(D)/libmad $(D)/libid3tag $(D)/libungif $(D)/openssl $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libboost $(D)/dvbsi $(D)/libflac $(D)/ffmpeg $(D)/libvorbis $(D)/openthreads $(D)/luaposix touch $@ -- 2.39.5