Skip to content

Commit 9c6e8f4

Browse files
committed
Merge pull request #673 from hashdist/gobject-introspection
Fixes gobject-introspection
2 parents 5f4fef1 + 790b117 commit 9c6e8f4

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

base/autotools_package.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ def configure(ctx, stage_args):
1919
set_env_flags: true # default
2020
env_flags_append: {'LDFLAGS', '-Wl,-rpath=${ARTIFACT}/lib'} # only meaningful if set_env_flags: true
2121
configure_path: . # default
22+
global_flags: false # default
2223
2324
If set_env_flags is set, CPPFLAGS and LDFLAGS will be set, as appropriate for the
2425
platform.
@@ -45,4 +46,8 @@ def configure(ctx, stage_args):
4546
for env_var, value in env.items():
4647
env_lines.append('export %s="%s"' % (env_var, ' '.join(value)))
4748

48-
return ['('] + env_lines + conf_lines + [')']
49+
r = env_lines + conf_lines
50+
if not stage_args.get('global_flags', False):
51+
r = ['('] + r + [')']
52+
53+
return r

pkgs/glib2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ defaults:
88
relocatable: false
99

1010
sources:
11-
- key: tar.bz2:szhzitzjjzh7cxzktos4zaxhi3pf6lf3
12-
url: http://ftp.gnome.org/pub/gnome/sources/glib/2.31/glib-2.31.2.tar.bz2
11+
- key: tar.xz:r47qqzjibzc3rtuebylw56b3z7krcfej
12+
url: http://ftp.gnome.org/pub/gnome/sources/glib/2.42/glib-2.42.1.tar.xz
1313

1414
when_build_dependency:
1515
- prepend_path: PKG_CONFIG_PATH

pkgs/gobject-introspection.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ defaults:
88
relocatable: false
99

1010
sources:
11-
- key: tar.bz2:hgpnmy6g6ca4cerhoehebwzyi2p34yat
12-
url: http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/1.31/gobject-introspection-1.31.0.tar.bz2
11+
- key: tar.xz:zdqaqmojot5flm77djgcvdgtw7b67tfv
12+
url: http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.43/gobject-introspection-1.43.3.tar.xz
13+
14+
build_stages:
15+
- name: configure
16+
global_flags: true
1317

1418
when_build_dependency:
1519
- prepend_path: PKG_CONFIG_PATH

0 commit comments

Comments
 (0)