From: Felix Fietkau Date: Mon, 18 Jun 2012 15:06:33 +0000 (+0000) Subject: zaptel-1.4.x: unbreak kernel module build, use cross-ar and cross-ranlib to fix furth... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4f6f648214fb4122623ff46c257bb516a017b6a2;p=openwrt%2Fsvn-archive%2Farchive.git zaptel-1.4.x: unbreak kernel module build, use cross-ar and cross-ranlib to fix further build issues SVN-Revision: 32425 --- diff --git a/libs/zaptel-1.4.x/Makefile b/libs/zaptel-1.4.x/Makefile index 69adbb4716..0e246d99ae 100644 --- a/libs/zaptel-1.4.x/Makefile +++ b/libs/zaptel-1.4.x/Makefile @@ -22,13 +22,13 @@ include $(INCLUDE_DIR)/package.mk define Package/zaptel14/Default TITLE:=Zaptel URL:=http://ftp.digium.com/pub/zaptel/releases - DEPENDS:=@BROKEN + DEPENDS:= endef define KernelPackage/zaptel14/Default TITLE:=Zaptel (kernel module) SUBMENU:=Other modules - DEPENDS:=@BROKEN + DEPENDS:= endef define KernelPackage/zaptel14 @@ -131,6 +131,8 @@ define Build/Compile/user $(MAKE) -C $(PKG_BUILD_DIR) \ ARCH="$(LINUX_KARCH)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ + AR="$(TARGET_CROSS)ar" \ + RANLIB="$(TARGET_CROSS)ranlib" \ install-libs install-include zttest ztcfg zttool ztdiag fxotune ztmonitor ztscan ztspeed fxstest endef diff --git a/libs/zaptel-1.4.x/patches/371-3.x.patch b/libs/zaptel-1.4.x/patches/371-3.x.patch new file mode 100644 index 0000000000..0404a4b1f3 --- /dev/null +++ b/libs/zaptel-1.4.x/patches/371-3.x.patch @@ -0,0 +1,23 @@ +--- a/kernel/zaptel-base.c ++++ b/kernel/zaptel-base.c +@@ -5182,14 +5182,20 @@ static int zt_ioctl(struct inode *inode, + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++#ifdef CONFIG_BKL + #include ++#endif + static long zt_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long data) + { + int ret; + ++#ifdef CONFIG_BKL + lock_kernel(); ++#endif + ret = zt_ioctl(file->f_path.dentry->d_inode, file, cmd, data); ++#ifdef CONFIG_BKL + unlock_kernel(); ++#endif + + return ret; + } diff --git a/libs/zaptel-1.4.x/patches/380-use_cross_ar.patch b/libs/zaptel-1.4.x/patches/380-use_cross_ar.patch new file mode 100644 index 0000000000..90f8ef54ce --- /dev/null +++ b/libs/zaptel-1.4.x/patches/380-use_cross_ar.patch @@ -0,0 +1,23 @@ +--- a/Makefile ++++ b/Makefile +@@ -30,6 +30,9 @@ else + UNAME_M:=$(DEB_HOST_GNU_TYPE) + endif + ++AR ?= ar ++RANLIB ?= ranlib ++ + # If you want to build for a kernel other than the current kernel, set KVERS + ifndef KVERS + KVERS:=$(shell uname -r) +@@ -352,8 +355,8 @@ ztspeed: CFLAGS= + sethdlc-new: CFLAGS+=-I$(KINCLUDES) + + $(LTZ_A): $(LTZ_A_OBJS) +- ar rcs $@ $^ +- ranlib $@ ++ $(AR) rcs $@ $^ ++ $(RANLIB) $@ + + $(LTZ_SO): $(LTZ_SO_OBJS) + $(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ $(LDFLAGS) $(LDLIBS) -lm