Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes gobject-introspection #673

Merged
merged 4 commits into from
Mar 6, 2015
Merged

Fixes gobject-introspection #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0f77a5
Update glib2
certik Feb 23, 2015
8d7bb03
Update gobject-introspection
certik Feb 23, 2015
cee9e0f
Introduce global_flags
certik Feb 23, 2015
790b117
Use global flags for gobject-introspection
certik Feb 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion base/autotools_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def configure(ctx, stage_args):
set_env_flags: true # default
env_flags_append: {'LDFLAGS', '-Wl,-rpath=${ARTIFACT}/lib'} # only meaningful if set_env_flags: true
configure_path: . # default
global_flags: false # default

If set_env_flags is set, CPPFLAGS and LDFLAGS will be set, as appropriate for the
platform.
Expand All @@ -45,4 +46,8 @@ def configure(ctx, stage_args):
for env_var, value in env.items():
env_lines.append('export %s="%s"' % (env_var, ' '.join(value)))

return ['('] + env_lines + conf_lines + [')']
r = env_lines + conf_lines
if not stage_args.get('global_flags', False):
r = ['('] + r + [')']

return r
4 changes: 2 additions & 2 deletions pkgs/glib2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ defaults:
relocatable: false

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

when_build_dependency:
- prepend_path: PKG_CONFIG_PATH
Expand Down
8 changes: 6 additions & 2 deletions pkgs/gobject-introspection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ defaults:
relocatable: false

sources:
- key: tar.bz2:hgpnmy6g6ca4cerhoehebwzyi2p34yat
url: http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/1.31/gobject-introspection-1.31.0.tar.bz2
- key: tar.xz:zdqaqmojot5flm77djgcvdgtw7b67tfv
url: http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.43/gobject-introspection-1.43.3.tar.xz

build_stages:
- name: configure
global_flags: true

when_build_dependency:
- prepend_path: PKG_CONFIG_PATH
Expand Down