Browse Source

Merge pull request #13966 from neheb/mes56

meson: update to 0.56.0
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
25d6c075ed
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
  1. +2
    -2
      devel/meson/Makefile
  2. +0
    -1
      devel/meson/meson.mk
  3. +4
    -4
      devel/meson/src/openwrt-cross.txt.in
  4. +1
    -1
      devel/meson/src/openwrt-native.txt.in

+ 2
- 2
devel/meson/Makefile View File

@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=meson
PKG_VERSION:=0.55.3
PKG_VERSION:=0.56.0
PKG_RELEASE:=1
PYPI_NAME:=meson
PKG_HASH:=6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5
PKG_HASH:=291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213
PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
PKG_LICENSE:=Apache-2.0


+ 0
- 1
devel/meson/meson.mk View File

@ -76,7 +76,6 @@ define Meson/CreateCrossFile
-e "s|@AR@|$(TARGET_AR)|" \
-e "s|@STRIP@|$(TARGET_CROSS)strip|" \
-e "s|@NM@|$(TARGET_NM)|" \
-e "s|@LD@|$(TARGET_CROSS)ld|" \
-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
-e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
-e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \


+ 4
- 4
devel/meson/src/openwrt-cross.txt.in View File

@ -4,15 +4,13 @@ cpp = [@CXX@]
ar = '@AR@'
strip = '@STRIP@'
nm = '@NM@'
ld = '@LD@'
pkgconfig = '@PKGCONFIG@'
[properties]
[built-in options]
c_args = [@CFLAGS@]
c_link_args = [@LDFLAGS@]
cpp_args = [@CXXFLAGS@]
cpp_link_args = [@LDFLAGS@]
needs_exe_wrapper = true
[host_machine]
system = 'linux'
@ -20,6 +18,8 @@ cpu_family = '@ARCH@'
cpu = '@CPU@'
endian = '@ENDIAN@'
[properties]
needs_exe_wrapper = true
[paths]
prefix = '/usr'
libdir = 'lib'

+ 1
- 1
devel/meson/src/openwrt-native.txt.in View File

@ -3,7 +3,7 @@ c = [@CC@]
cpp = [@CXX@]
pkgconfig = '@PKGCONFIG@'
[properties]
[built-in options]
c_args = [@CFLAGS@]
c_link_args = [@LDFLAGS@]
cpp_args = [@CXXFLAGS@]


Loading…
Cancel
Save