* [Buildroot] svn commit: trunk/buildroot/package/socat
@ 2007-07-17 12:04 ulf at uclibc.org
0 siblings, 0 replies; 4+ messages in thread
From: ulf at uclibc.org @ 2007-07-17 12:04 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-17 05:04:36 -0700 (Tue, 17 Jul 2007)
New Revision: 19129
Log:
Avoid constant rebuild of 'socat'
Modified:
trunk/buildroot/package/socat/socat.mk
Changeset:
Modified: trunk/buildroot/package/socat/socat.mk
===================================================================
--- trunk/buildroot/package/socat/socat.mk 2007-07-17 12:02:44 UTC (rev 19128)
+++ trunk/buildroot/package/socat/socat.mk 2007-07-17 12:04:36 UTC (rev 19129)
@@ -57,6 +57,7 @@
$(SOCAT_WORKDIR)/.installed: $(SOCAT_WORKDIR)/socat
mkdir -p $(TARGET_DIR)/usr/man/man1
$(MAKE) -C $(SOCAT_WORKDIR) install prefix=$(TARGET_DIR)/usr DESTDIR=$(TARGET_DIR)
+ touch $@
socat: uclibc $(SOCAT_WORKDIR)/.installed
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/socat
@ 2009-01-02 8:29 ulf at uclibc.org
2009-01-02 9:02 ` Peter Korsgaard
0 siblings, 1 reply; 4+ messages in thread
From: ulf at uclibc.org @ 2009-01-02 8:29 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-02 08:29:31 +0000 (Fri, 02 Jan 2009)
New Revision: 24643
Log:
Bump socat version, optionally add configure variables
Modified:
trunk/buildroot/package/socat/Config.in
trunk/buildroot/package/socat/socat.mk
Changeset:
Modified: trunk/buildroot/package/socat/Config.in
===================================================================
--- trunk/buildroot/package/socat/Config.in 2009-01-01 21:20:46 UTC (rev 24642)
+++ trunk/buildroot/package/socat/Config.in 2009-01-02 08:29:31 UTC (rev 24643)
@@ -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
+
+
Modified: trunk/buildroot/package/socat/socat.mk
===================================================================
--- trunk/buildroot/package/socat/socat.mk 2009-01-01 21:20:46 UTC (rev 24642)
+++ trunk/buildroot/package/socat/socat.mk 2009-01-02 08:29:31 UTC (rev 24643)
@@ -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 @@
(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 @@
$(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)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/socat
2009-01-02 8:29 ulf at uclibc.org
@ 2009-01-02 9:02 ` Peter Korsgaard
2009-01-02 22:33 ` Ulf Samuelsson
0 siblings, 1 reply; 4+ messages in thread
From: Peter Korsgaard @ 2009-01-02 9:02 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
Hi,
ulf> http://www.dest-unreach.org/socat/
ulf> +if BR2_PACKAGE_SOCAT
ulf> +config BR2_PACKAGE_SOCAT_PREDEF_CRDLY_SHIFT
ulf> + string "CRDLY_SHIFT"
ulf> + default "9"
ulf> + help
ulf> + Add configure variable
ulf> +
ulf> +config BR2_PACKAGE_SOCAT_PREDEF_TABDLY_SHIFT
ulf> + string "TABDLY_SHIFT"
ulf> + default "11"
ulf> + help
ulf> + Add configure variable
That's not very descriptive.
ulf> $(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked
ulf> @@ -30,6 +53,7 @@
ulf> (cd $(SOCAT_WORKDIR); rm -rf config.cache; \
ulf> $(TARGET_CONFIGURE_OPTS) \
ulf> $(TARGET_CONFIGURE_ARGS) \
ulf> + $(SOCAT_CONFIGURE_OPTS) \
ulf> $(SOCAT_DIR)/configure \
ulf> --target=$(GNU_TARGET_NAME) \
ulf> --host=$(GNU_TARGET_NAME) \
How about converting it to Makefile.autotools.in format while you're
at it?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/socat
2009-01-02 9:02 ` Peter Korsgaard
@ 2009-01-02 22:33 ` Ulf Samuelsson
0 siblings, 0 replies; 4+ messages in thread
From: Ulf Samuelsson @ 2009-01-02 22:33 UTC (permalink / raw)
To: buildroot
fre 2009-01-02 klockan 10:02 +0100 skrev Peter Korsgaard:
> >>>>> "ulf" == ulf <ulf@uclibc.org> writes:
>
> Hi,
>
> ulf> http://www.dest-unreach.org/socat/
> ulf> +if BR2_PACKAGE_SOCAT
> ulf> +config BR2_PACKAGE_SOCAT_PREDEF_CRDLY_SHIFT
> ulf> + string "CRDLY_SHIFT"
> ulf> + default "9"
> ulf> + help
> ulf> + Add configure variable
> ulf> +
> ulf> +config BR2_PACKAGE_SOCAT_PREDEF_TABDLY_SHIFT
> ulf> + string "TABDLY_SHIFT"
> ulf> + default "11"
> ulf> + help
> ulf> + Add configure variable
>
> That's not very descriptive.
I have little clue of what it is used for
except some kind of delay when a TAB character is received
Old socat version breaks for some reason and it is really ancient.
socat configure is not able to build without it
The socat source contains defaults for Linux-2.6.24,
and the documentation recommends using this
if configure cannot deduct a resonable value.
>
> ulf> $(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked
> ulf> @@ -30,6 +53,7 @@
> ulf> (cd $(SOCAT_WORKDIR); rm -rf config.cache; \
> ulf> $(TARGET_CONFIGURE_OPTS) \
> ulf> $(TARGET_CONFIGURE_ARGS) \
> ulf> + $(SOCAT_CONFIGURE_OPTS) \
> ulf> $(SOCAT_DIR)/configure \
> ulf> --target=$(GNU_TARGET_NAME) \
> ulf> --host=$(GNU_TARGET_NAME) \
>
> How about converting it to Makefile.autotools.in format while you're
> at it?
Lots of things to do, and this has less priority
than fixing U-boot for AT91/at91bootstrap etc.
/Ulf
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-01-02 22:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-17 12:04 [Buildroot] svn commit: trunk/buildroot/package/socat ulf at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-01-02 8:29 ulf at uclibc.org
2009-01-02 9:02 ` Peter Korsgaard
2009-01-02 22:33 ` Ulf Samuelsson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox