Bump socat version, optionally add configure variables

diff --git a/package/socat/Config.in b/package/socat/Config.in
index ae88be907369ad21aacaacf01bdc347381cb6840..151b74e45082abc8d6f16426814591afc13edbb9 100644 (file)
--- a/package/socat/Config.in
+++ b/package/socat/Config.in
@@ -1,6 +1,28 @@
-config BR2_PACKAGE_SOCAT
+menuconfig BR2_PACKAGE_SOCAT
        bool "socat"
        help
          Multipurpose socket relay program.
 
          http://www.dest-unreach.org/socat/
+if BR2_PACKAGE_SOCAT
+config BR2_PACKAGE_SOCAT_PREDEF_CRDLY_SHIFT
+       string "CRDLY_SHIFT"
+       default "9"
+       help
+         Add configure variable
+
+config BR2_PACKAGE_SOCAT_PREDEF_TABDLY_SHIFT
+       string "TABDLY_SHIFT"
+       default "11"
+       help
+         Add configure variable
+
+config BR2_PACKAGE_SOCAT_PREDEF_CSIZE_SHIFT
+       string "CSIZE_SHIFT"
+       default "4"
+       help
+         Add configure variable
+
+endif
+
+

diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index a416e75cf1f5b25dd6a3ddec22b7bb16207968ee..ebaea6b55699a02f6bb7c12a4f2049ce03edec1f 100644 (file)
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -4,24 +4,47 @@
 #
 #############################################################
 
-SOCAT_VERSION=1.4.0.3
+#SOCAT_MAJOR_VERSION=1.4
+#SOCAT_MINOR_VERSION=.0.3
+SOCAT_MAJOR_VERSION=2.0.0-b2
+SOCAT_MINOR_VERSION=
 
 # Don't alter below this line unless you (think) you know
 # what you are doing! Danger, Danger!
 
-SOCAT_SOURCE=socat-$(SOCAT_VERSION).tar.bz2
+SOCAT_SOURCE=socat-$(SOCAT_MAJOR_VERSION)$(SOCAT_MINOR_VERSION).tar.bz2
 SOCAT_CAT:=$(BZCAT)
 SOCAT_SITE=http://www.dest-unreach.org/socat/download/
 #SOCAT_DIR=$(BUILD_DIR)/${shell basename $(SOCAT_SOURCE) .tar.bz2}
-SOCAT_DIR=$(BUILD_DIR)/socat-1.4
+SOCAT_DIR=$(BUILD_DIR)/socat-$(SOCAT_MAJOR_VERSION)
 #SOCAT_WORKDIR=$(BUILD_DIR)/socat_workdir
 SOCAT_WORKDIR=$(SOCAT_DIR)
 
+# SOCAT Configure opts taken from Config/config.Linux-2.6.24.h
+CRDLY_SHIFT := $(strip $(subst ",,$(BR2_PACKAGE_SOCAT_PREDEF_CRDLY_SHIFT)))
+#"))
+TABDLY_SHIFT := $(strip $(subst ",,$(BR2_PACKAGE_SOCAT_PREDEF_TABDLY_SHIFT)))
+#"))
+CSIZE_SHIFT := $(strip $(subst ",,$(BR2_PACKAGE_SOCAT_PREDEF_CSIZE_SHIFT)))
+#"))
+
+SOCAT_CONFIGURE_OPTS :=
+ifneq ($(CRDLY_SHIFT),)
+SOCAT_CONFIGURE_OPTS += sc_cv_sys_crdly_shift=$(CRDLY_SHIFT)
+endif
+ifneq ($(TABDLY_SHIFT),)
+SOCAT_CONFIGURE_OPTS += sc_cv_sys_tabdly_shift=$(TABDLY_SHIFT)
+endif
+ifneq ($(CRDLY_SHIFT),)
+SOCAT_CONFIGURE_OPTS += sc_cv_sys_csize_shift=$(CSIZE_SHIFT)
+endif
+
 $(DL_DIR)/$(SOCAT_SOURCE):
        $(WGET) -P $(DL_DIR) $(SOCAT_SITE)/$(SOCAT_SOURCE)
 
 $(SOCAT_DIR)/.unpacked: $(DL_DIR)/$(SOCAT_SOURCE)
        $(SOCAT_CAT) $(DL_DIR)/$(SOCAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       toolchain/patch-kernel.sh $(SOCAT_DIR) package/socat/ socat-$(SOCAT_MAJOR_VERSION)\*.patch
        touch $(SOCAT_DIR)/.unpacked
 
 $(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked
@@ -30,6 +53,7 @@ $(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked
        (cd $(SOCAT_WORKDIR); rm -rf config.cache; \
                $(TARGET_CONFIGURE_OPTS) \
                $(TARGET_CONFIGURE_ARGS) \
+               $(SOCAT_CONFIGURE_OPTS) \
                $(SOCAT_DIR)/configure \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
@@ -50,6 +74,9 @@ $(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked
        $(SED) 's/#define HAVE_TERMIOS_ISPEED 1/#undef HAVE_TERMIOS_ISPEED/g' config.h; \
        )
 
+#      cp $(SOCAT_WORKDIR)/Config/config.Linux-2-6*.h $(SOCAT_WORKDIR)/config.h ; \
+
+
 $(SOCAT_WORKDIR)/socat: $(SOCAT_WORKDIR)/Makefile
        rm -f $@
        $(MAKE) -C $(SOCAT_WORKDIR)