Browse Source

Merge pull request #12519 from Andy2244/samba-4.12.3-unbundle-icu-libunwind

samba4: unbundle libunwind, icu
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
3a9df5a417
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 1 deletions
  1. +1
    -1
      net/samba4/Makefile
  2. +23
    -0
      net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch
  3. +30
    -0
      net/samba4/patches/104-samba-4.12-unbundle-icu.patch

+ 1
- 1
net/samba4/Makefile View File

@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=samba
PKG_VERSION:=4.12.3
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \


+ 23
- 0
net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch View File

@ -0,0 +1,23 @@
--- a/lib/util/wscript_configure 2020-06-14
+++ b/lib/util/wscript_configure 2020-06-14
@@ -11,13 +11,13 @@ conf.CHECK_FUNCS_IN('backtrace backtrace
conf.CHECK_HEADERS('execinfo.h')
conf.SET_TARGET_TYPE('LIBUNWIND', 'EMPTY')
-if conf.check_cfg(package='libunwind-generic',
- args='--cflags --libs',
- msg='Checking for libunwind',
- uselib_store='LIBUNWIND',
- mandatory=False):
- if conf.CHECK_HEADERS('libunwind.h'):
- conf.SET_TARGET_TYPE('LIBUNWIND', 'SYSLIB')
+# if conf.check_cfg(package='libunwind-generic',
+ # args='--cflags --libs',
+ # msg='Checking for libunwind',
+ # uselib_store='LIBUNWIND',
+ # mandatory=False):
+ # if conf.CHECK_HEADERS('libunwind.h'):
+ # conf.SET_TARGET_TYPE('LIBUNWIND', 'SYSLIB')
conf.CHECK_STRUCTURE_MEMBER('struct statvfs', 'f_frsize', define='HAVE_FRSIZE', headers='sys/statvfs.h')

+ 30
- 0
net/samba4/patches/104-samba-4.12-unbundle-icu.patch View File

@ -0,0 +1,30 @@
--- a/lib/util/charset/wscript_configure 2020-06-14
+++ b/lib/util/charset/wscript_configure 2020-06-14
@@ -37,15 +37,15 @@ conf.CHECK_CODE('''
lib='iconv',
headers='errno.h iconv.h')
-if conf.CHECK_CFG(package='icu-i18n',
- args='--cflags --libs',
- msg='Checking for icu-i18n',
- uselib_store='ICU_I18N'):
- for lib in conf.env['LIB_ICU_I18N']:
- conf.CHECK_LIB(lib, shlib=True, mandatory=True)
- conf.env['icu-libs'] = ' '.join(conf.env['LIB_ICU_I18N'])
- if not conf.CHECK_HEADERS('unicode/ustring.h'):
- conf.fatal('Found libicu, but unicode/ustring.h is missing')
- conf.DEFINE('HAVE_UTF8_NORMALISATION', 1)
-else:
- conf.env['icu-libs'] = ''
+# if conf.CHECK_CFG(package='icu-i18n',
+ # args='--cflags --libs',
+ # msg='Checking for icu-i18n',
+ # uselib_store='ICU_I18N'):
+ # for lib in conf.env['LIB_ICU_I18N']:
+ # conf.CHECK_LIB(lib, shlib=True, mandatory=True)
+ # conf.env['icu-libs'] = ' '.join(conf.env['LIB_ICU_I18N'])
+ # if not conf.CHECK_HEADERS('unicode/ustring.h'):
+ # conf.fatal('Found libicu, but unicode/ustring.h is missing')
+ # conf.DEFINE('HAVE_UTF8_NORMALISATION', 1)
+# else:
+conf.env['icu-libs'] = ''

Loading…
Cancel
Save