macOS: use Apple GL/GLU by default (#36618)
* macOS: use Apple GL/GLU by default * Use CLT instead * Use CLT instead * Undo change to libuuid
This commit is contained in:
parent
7dc0bf5fcb
commit
ee7cdb8a68
3 changed files with 19 additions and 21 deletions
|
@ -23,8 +23,20 @@ packages:
|
||||||
providers:
|
providers:
|
||||||
elf: [libelf]
|
elf: [libelf]
|
||||||
fuse: [macfuse]
|
fuse: [macfuse]
|
||||||
|
gl: [apple-gl]
|
||||||
|
glu: [apple-glu]
|
||||||
unwind: [apple-libunwind]
|
unwind: [apple-libunwind]
|
||||||
uuid: [apple-libuuid]
|
uuid: [apple-libuuid]
|
||||||
|
apple-gl:
|
||||||
|
buildable: false
|
||||||
|
externals:
|
||||||
|
- spec: apple-gl@4.1.0
|
||||||
|
prefix: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
|
||||||
|
apple-glu:
|
||||||
|
buildable: false
|
||||||
|
externals:
|
||||||
|
- spec: apple-glu@1.3.0
|
||||||
|
prefix: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
|
||||||
apple-libunwind:
|
apple-libunwind:
|
||||||
buildable: false
|
buildable: false
|
||||||
externals:
|
externals:
|
||||||
|
|
|
@ -30,11 +30,6 @@ class AppleGl(Package):
|
||||||
|
|
||||||
phases = []
|
phases = []
|
||||||
|
|
||||||
sdk_base = (
|
|
||||||
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/"
|
|
||||||
"Developer/SDKs/MacOSX"
|
|
||||||
)
|
|
||||||
|
|
||||||
def setup_dependent_build_environment(self, env, dependent_spec):
|
def setup_dependent_build_environment(self, env, dependent_spec):
|
||||||
# we try to setup a build environment with enough hints
|
# we try to setup a build environment with enough hints
|
||||||
# for the build system to pick up on the Apple framework version
|
# for the build system to pick up on the Apple framework version
|
||||||
|
@ -44,16 +39,14 @@ def setup_dependent_build_environment(self, env, dependent_spec):
|
||||||
# - for the rest of the build systems we'll assume that
|
# - for the rest of the build systems we'll assume that
|
||||||
# setting the C_INCLUDE_PATH will be enough for the compilation phase
|
# setting the C_INCLUDE_PATH will be enough for the compilation phase
|
||||||
# and *** for the link phase.
|
# and *** for the link phase.
|
||||||
env.prepend_path("C_INCLUDE_PATH", self.sdk_base)
|
env.prepend_path("C_INCLUDE_PATH", self.prefix[:-4])
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def headers(self):
|
def headers(self):
|
||||||
return HeaderList(
|
return HeaderList(
|
||||||
"{}.sdk/System/Library/Frameworks/OpenGL.framework/Headers".format(self.sdk_base)
|
join_path(self.prefix, "System/Library/Frameworks/OpenGL.framework/Headers")
|
||||||
)
|
)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def libs(self):
|
def libs(self):
|
||||||
return LibraryList(
|
return LibraryList(join_path(self.prefix, "System/Library/Frameworks/OpenGL.framework"))
|
||||||
"{}.sdk/System/Library/Frameworks/OpenGL.framework".format(self.sdk_base)
|
|
||||||
)
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
class AppleGlu(Package):
|
class AppleGlu(Package):
|
||||||
"""Shim package for Apple implementation of OpenGL Utility Libray (GLU)"""
|
"""Shim package for Apple implementation of OpenGL Utility Libray (GLU)"""
|
||||||
|
|
||||||
homepage = ""
|
homepage = "https://developer.apple.com/library/archive/documentation/GraphicsImaging/Conceptual/OpenGL-MacProgGuide/opengl_intro/opengl_intro.html"
|
||||||
|
|
||||||
maintainers("aphecetche")
|
maintainers("aphecetche")
|
||||||
|
|
||||||
|
@ -28,11 +28,6 @@ class AppleGlu(Package):
|
||||||
|
|
||||||
phases = []
|
phases = []
|
||||||
|
|
||||||
sdk_base = (
|
|
||||||
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/"
|
|
||||||
"Developer/SDKs/MacOSX"
|
|
||||||
)
|
|
||||||
|
|
||||||
def setup_dependent_build_environment(self, env, dependent_spec):
|
def setup_dependent_build_environment(self, env, dependent_spec):
|
||||||
# we try to setup a build environment with enough hints
|
# we try to setup a build environment with enough hints
|
||||||
# for the build system to pick up on the Apple framework version
|
# for the build system to pick up on the Apple framework version
|
||||||
|
@ -42,16 +37,14 @@ def setup_dependent_build_environment(self, env, dependent_spec):
|
||||||
# - for the rest of the build systems we'll assume that
|
# - for the rest of the build systems we'll assume that
|
||||||
# setting the C_INCLUDE_PATH will be enough for the compilation phase
|
# setting the C_INCLUDE_PATH will be enough for the compilation phase
|
||||||
# and *** for the link phase.
|
# and *** for the link phase.
|
||||||
env.prepend_path("C_INCLUDE_PATH", self.sdk_base)
|
env.prepend_path("C_INCLUDE_PATH", self.prefix[:-4])
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def headers(self):
|
def headers(self):
|
||||||
return HeaderList(
|
return HeaderList(
|
||||||
"{}.sdk/System/Library/Frameworks/OpenGL.framework/Headers".format(self.sdk_base)
|
join_path(self.prefix, "System/Library/Frameworks/OpenGL.framework/Headers")
|
||||||
)
|
)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def libs(self):
|
def libs(self):
|
||||||
return LibraryList(
|
return LibraryList(join_path(self.prefix, "System/Library/Frameworks/OpenGL.framework"))
|
||||||
"{}.sdk/System/Library/Frameworks/OpenGL.framework".format(self.sdk_base)
|
|
||||||
)
|
|
||||||
|
|
Loading…
Reference in a new issue