mirror of https://github.com/hak5/openwrt-owl.git
samba36: remove host build paths
- fix iconv detection because it adds host paths - disable python detection (host python-config is found) iconv issue is reported by buildbot config.log + replicated locally see config.log in logs.tar.gz python issue observed locally on Arch Linux Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> SVN-Revision: 45953owl
parent
813635b2c8
commit
32055c0833
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=samba
|
PKG_NAME:=samba
|
||||||
PKG_VERSION:=3.6.25
|
PKG_VERSION:=3.6.25
|
||||||
PKG_RELEASE:=3
|
PKG_RELEASE:=4
|
||||||
|
|
||||||
PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
|
PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
|
||||||
http://ftp.samba.org/pub/samba/stable
|
http://ftp.samba.org/pub/samba/stable
|
||||||
|
@ -35,7 +35,7 @@ define Package/samba36-server
|
||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
TITLE:=Samba 3.6 SMB/CIFS server
|
TITLE:=Samba 3.6 SMB/CIFS server
|
||||||
URL:=http://www.samba.org/
|
URL:=http://www.samba.org/
|
||||||
DEPENDS:=+USE_GLIBC:librt
|
DEPENDS:=+USE_GLIBC:librt $(ICONV_DEPENDS)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/samba36-client
|
define Package/samba36-client
|
||||||
|
@ -83,7 +83,9 @@ CONFIGURE_VARS += \
|
||||||
samba_cv_have_setreuid=yes \
|
samba_cv_have_setreuid=yes \
|
||||||
samba_cv_have_setresuid=yes \
|
samba_cv_have_setresuid=yes \
|
||||||
ac_cv_header_zlib_h=no \
|
ac_cv_header_zlib_h=no \
|
||||||
samba_cv_zlib_1_2_3=no
|
samba_cv_zlib_1_2_3=no \
|
||||||
|
ac_cv_path_PYTHON="" \
|
||||||
|
ac_cv_path_PYTHON_CONFIG=""
|
||||||
|
|
||||||
CONFIGURE_ARGS += \
|
CONFIGURE_ARGS += \
|
||||||
--exec-prefix=/usr \
|
--exec-prefix=/usr \
|
||||||
|
@ -95,6 +97,7 @@ CONFIGURE_ARGS += \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--disable-swat \
|
--disable-swat \
|
||||||
--disable-shared-libs \
|
--disable-shared-libs \
|
||||||
|
--with-libiconv="$(ICONV_PREFIX)" \
|
||||||
--with-codepagedir=/etc/samba \
|
--with-codepagedir=/etc/samba \
|
||||||
--with-configdir=/etc/samba \
|
--with-configdir=/etc/samba \
|
||||||
--with-included-iniparser \
|
--with-included-iniparser \
|
||||||
|
|
Loading…
Reference in New Issue