mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-12 23:44:20 +00:00
aedi: update glib to 2.68.3
This commit is contained in:
parent
e145226224
commit
793c8e4d95
1 changed files with 7 additions and 3 deletions
|
@ -162,8 +162,8 @@ class GlibTarget(BuildTarget):
|
||||||
|
|
||||||
def prepare_source(self, state: BuildState):
|
def prepare_source(self, state: BuildState):
|
||||||
state.download_source(
|
state.download_source(
|
||||||
'https://download.gnome.org/sources/glib/2.66/glib-2.66.4.tar.xz',
|
'https://download.gnome.org/sources/glib/2.68/glib-2.68.3.tar.xz',
|
||||||
'97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984')
|
'e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138')
|
||||||
|
|
||||||
def detect(self, state: BuildState) -> bool:
|
def detect(self, state: BuildState) -> bool:
|
||||||
return os.path.exists(state.source + 'glib.doap')
|
return os.path.exists(state.source + 'glib.doap')
|
||||||
|
@ -172,7 +172,7 @@ class GlibTarget(BuildTarget):
|
||||||
super().configure(state)
|
super().configure(state)
|
||||||
|
|
||||||
environment = self.environment
|
environment = self.environment
|
||||||
environment['LDFLAGS'] += ' -framework CoreFoundation'
|
environment['LDFLAGS'] += ' -framework CoreFoundation -framework Foundation'
|
||||||
|
|
||||||
cpu = state.architecture()
|
cpu = state.architecture()
|
||||||
cpu_family = 'arm' if 'arm64' == cpu else cpu
|
cpu_family = 'arm' if 'arm64' == cpu else cpu
|
||||||
|
@ -212,6 +212,10 @@ endian = 'little'
|
||||||
def post_build(self, state: BuildState):
|
def post_build(self, state: BuildState):
|
||||||
self.install(state, tool='ninja')
|
self.install(state, tool='ninja')
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _process_pkg_config(pcfile: str, line: str) -> str:
|
||||||
|
return 'exec_prefix=${prefix}\n' + line if line.startswith('libdir=') else line
|
||||||
|
|
||||||
|
|
||||||
class IconvTarget(ConfigureMakeStaticDependencyTarget):
|
class IconvTarget(ConfigureMakeStaticDependencyTarget):
|
||||||
def __init__(self, name='iconv'):
|
def __init__(self, name='iconv'):
|
||||||
|
|
Loading…
Reference in a new issue