David pushed to branch master at VideoLAN / VLC
Commits:
ffaadb57 by Marvin Scholz at 2022-01-04T19:40:24+00:00
macosx: add rpath for Frameworks
The Frameworks folder was missing in the rpath, leading to Frameworks
like Sparkle requiring change of the install_name after it was built
instead of just using rpath properly.
- - - - -
b97c1377 by Marvin Scholz at 2022-01-04T19:40:24+00:00
contrib: sparkle: do not change install_name
Changing the install name is no longer necessary since
0831e42ecb6878bec2b3a0e07d56123a730d6a98
and doing so breaks the ad-hoc code signing leading to a broken
bundle and pseudo-bundle on arm64 which requires ad-hoc signing.
Fix #26127
- - - - -
2 changed files:
- bin/Makefile.am
- contrib/src/sparkle/rules.mak
Changes:
=====================================
bin/Makefile.am
=====================================
@@ -63,6 +63,7 @@ vlc_osx_static_OBJCFLAGS = $(AM_OBJCFLAGS) \
vlc_osx_static_LDFLAGS = $(vlc_osx_LDFLAGS) -static
vlc_osx_static_LDFLAGS += -Xlinker -rpath -Xlinker
"@executable_path/../lib/.libs/"
vlc_osx_static_LDFLAGS += -Xlinker -rpath -Xlinker
"@executable_path/../src/.libs/"
+vlc_osx_static_LDFLAGS += -Xlinker -rpath -Xlinker
"@executable_path/../Frameworks/"
vlc_osx_static_LDADD = $(vlc_osx_LDADD)
if HAVE_BREAKPAD
vlc_osx_static_LDFLAGS += -Wl,-framework,Breakpad
=====================================
contrib/src/sparkle/rules.mak
=====================================
@@ -19,7 +19,6 @@ sparkle: Sparkle-$(SPARKLE_VERSION).zip .sum-sparkle
.sparkle: sparkle
# Build Sparkle and change the @rpath
cd $< && xcodebuild $(XCODE_FLAGS)
- cd $< && install_name_tool -id
@executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle
build/Release/Sparkle.framework/Versions/A/Sparkle
# Install
cd $< && mkdir -p "$(PREFIX)/Frameworks" && \
rm -Rf "$(PREFIX)/Frameworks/Sparkle.framework" && \
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/52ef980fb2ad9ca45f2db7d114a3e957457612bb...b97c1377fd5d68d3c268e5461813400a9bd9c9b9
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/52ef980fb2ad9ca45f2db7d114a3e957457612bb...b97c1377fd5d68d3c268e5461813400a9bd9c9b9
You're receiving this email because of your account on code.videolan.org.
_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
