From 5eb808d3b0d2dca7016e7200418a95a0eb6330d4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 6 Jan 2014 09:54:52 +0100 Subject: musl fixes after update to 0.9.15 --- package/quagga/patches/patch-lib_sockopt_c | 23 ----------------------- package/xorg-server/Makefile | 2 ++ 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 package/quagga/patches/patch-lib_sockopt_c diff --git a/package/quagga/patches/patch-lib_sockopt_c b/package/quagga/patches/patch-lib_sockopt_c deleted file mode 100644 index c33333766..000000000 --- a/package/quagga/patches/patch-lib_sockopt_c +++ /dev/null @@ -1,23 +0,0 @@ ---- quagga-0.99.22.4.orig/lib/sockopt.c 2013-04-14 14:46:07.000000000 +0200 -+++ quagga-0.99.22.4/lib/sockopt.c 2013-12-30 19:56:54.000000000 +0100 -@@ -24,6 +24,20 @@ - #include "sockopt.h" - #include "sockunion.h" - -+#if !defined(__GLIBC__) -+/* For TCP_MD5SIG socket option. */ -+#define TCP_MD5SIG_MAXKEYLEN 80 -+ -+struct tcp_md5sig -+{ -+ struct sockaddr_storage tcpm_addr; /* Address associated. */ -+ u_int16_t __tcpm_pad1; /* Zero. */ -+ u_int16_t tcpm_keylen; /* Key length. */ -+ u_int32_t __tcpm_pad2; /* Zero. */ -+ u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */ -+}; -+#endif -+ - int - setsockopt_so_recvbuf (int sock, int size) - { diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 6ca4f67f0..3305779ab 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -43,6 +43,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +TARGET_CPPFLAGS+= -D_GNU_SOURCE + ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) CONFIGURE_ARGS+= --with-sha1=libgcrypt endif -- cgit v1.2.3