summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-12-27 10:09:18 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2014-12-27 10:09:31 -0600
commitd0f28d078f2d1e2c6eaa86fd3c82d4e3ca47c599 (patch)
tree1cec3f207bd66a66d78a7dc9a8e75f1896103c13
parent1ab7bd87cd236c4f83ac415cebd1fbee06421d3c (diff)
fix build error
-rw-r--r--package/socat/Makefile1
-rw-r--r--package/socat/patches/patch-configure23
2 files changed, 1 insertions, 23 deletions
diff --git a/package/socat/Makefile b/package/socat/Makefile
index 95d1aaaca..a03bb15b5 100644
--- a/package/socat/Makefile
+++ b/package/socat/Makefile
@@ -24,6 +24,7 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+AUTOTOOL_STYLE:= autoconf
CONFIGURE_ENV+= sc_cv_termios_ispeed=no \
sc_cv_sys_crdly_shift=9 \
sc_cv_sys_tabdly_shift=11 \
diff --git a/package/socat/patches/patch-configure b/package/socat/patches/patch-configure
deleted file mode 100644
index 75b014290..000000000
--- a/package/socat/patches/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
---- socat-1.7.2.4.orig/configure 2014-03-09 20:57:51.000000000 +0100
-+++ socat-1.7.2.4/configure 2014-03-22 12:20:13.000000000 +0100
-@@ -3347,18 +3347,8 @@ fi
- # fail
-
-
--
--if test "$CC" = "gcc"; then
-- CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
-- ERRONWARN="-Werror -O0"
--elif test "$CC" = "clang"; then
-- CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
-- ERRONWARN="-Werror -O0"
--#elif Sun Studio
--# ERRONWARN="-errwarn"
--else
-- ERRONWARN=
--fi
-+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
-+ERRONWARN="-Werror -O0"
- export CFLAGS
-
-