Merge pull request #2472 from eluancm/eluan

Fixes for building Generic/x86_64 under Gentoo/amd64

packages/devel/slang/package.mk

@@ -28,6 +28,8 @@ PKG_SECTION="devel"
 PKG_SHORTDESC="slang: multi-platform programmer's library designed to allow a developer to create robust multi-platform software."
 PKG_LONGDESC="S-Lang is a multi-platform programmer's library designed to allow a developer to create robust multi-platform software. It provides facilities required by interactive applications such as display/screen management, keyboard input, keymaps, and so on. The most exciting feature of the library is the slang interpreter that may be easily embedded into a program to make it extensible. While the emphasis has always been on the embedded nature of the interpreter, it may also be used in a stand-alone fashion through the use of slsh, which is part of the S-Lang distribution."
 
+PKG_CONFIGURE_OPTS_TARGET="--without-onig"
+
 MAKEFLAGS=-j1
 
 pre_configure_target() {

packages/network/libdnet/patches/00-fix_strlcpy_strlcat.patch

@@ -0,0 +1,68 @@
+diff -Naur libdnet-1.12/acconfig.h libdnet-1.12-patch/acconfig.h
+--- libdnet-1.12/acconfig.h	2018-02-01 15:55:19.346009246 -0500
++++ libdnet-1.12-patch/acconfig.h	2018-02-01 15:59:14.826008240 -0500
+@@ -20,11 +20,11 @@
+ #endif
+ 
+ #ifndef HAVE_STRLCAT
+-int	strlcat(char *, const char *, int);
++size_t	strlcat(char *, const char *, size_t);
+ #endif
+ 
+ #ifndef HAVE_STRLCPY
+-int	strlcpy(char *, const char *, int);
++size_t	strlcpy(char *, const char *, size_t);
+ #endif
+ 
+ #ifndef HAVE_STRSEP
+diff -Naur libdnet-1.12/include/config.h.in libdnet-1.12-patch/include/config.h.in
+--- libdnet-1.12/include/config.h.in	2018-02-01 15:51:57.346010109 -0500
++++ libdnet-1.12-patch/include/config.h.in	2018-02-01 15:59:47.316008101 -0500
+@@ -282,11 +282,11 @@
+ #endif
+ 
+ #ifndef HAVE_STRLCAT
+-int	strlcat(char *, const char *, int);
++size_t	strlcat(char *, const char *, size_t);
+ #endif
+ 
+ #ifndef HAVE_STRLCPY
+-int	strlcpy(char *, const char *, int);
++size_t	strlcpy(char *, const char *, size_t);
+ #endif
+ 
+ #ifndef HAVE_STRSEP
+diff -Naur libdnet-1.12/trunk/acconfig.h libdnet-1.12-patch/trunk/acconfig.h
+--- libdnet-1.12/trunk/acconfig.h	2018-02-01 15:51:57.356010109 -0500
++++ libdnet-1.12-patch/trunk/acconfig.h	2018-02-01 16:00:08.526008010 -0500
+@@ -20,11 +20,11 @@
+ #endif
+ 
+ #ifndef HAVE_STRLCAT
+-int	strlcat(char *, const char *, int);
++size_t	strlcat(char *, const char *, size_t);
+ #endif
+ 
+ #ifndef HAVE_STRLCPY
+-int	strlcpy(char *, const char *, int);
++size_t	strlcpy(char *, const char *, size_t);
+ #endif
+ 
+ #ifndef HAVE_STRSEP
+diff -Naur libdnet-1.12/trunk/include/config.h.in libdnet-1.12-patch/trunk/include/config.h.in
+--- libdnet-1.12/trunk/include/config.h.in	2018-02-01 15:51:57.356010109 -0500
++++ libdnet-1.12-patch/trunk/include/config.h.in	2018-02-01 16:00:34.786007898 -0500
+@@ -282,11 +282,11 @@
+ #endif
+ 
+ #ifndef HAVE_STRLCAT
+-int	strlcat(char *, const char *, int);
++size_t	strlcat(char *, const char *, size_t);
+ #endif
+ 
+ #ifndef HAVE_STRLCPY
+-int	strlcpy(char *, const char *, int);
++size_t	strlcpy(char *, const char *, size_t);
+ #endif
+ 
+ #ifndef HAVE_STRSEP

packages/network/samba/package.mk

@@ -139,6 +139,7 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/lib/python*
   rm -rf $INSTALL/usr/share/perl*
+  rm -rf $INSTALL/usr/lib64
 
   mkdir -p $INSTALL/usr/lib/samba
     cp $PKG_DIR/scripts/samba-config $INSTALL/usr/lib/samba