Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-10-12 13:21:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

glibc 2.34 fix

Browse source 
Tested working to compile mako on Fedora 35

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2021-11-14 19:44:53 -05:00
parent b8f5d8a510
commit f950398fa1
4 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scripts/LineageOS-17.1/Patch.sh
View file

@ -279,6 +279,12 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP
echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list
sed -i 's/messaging/Silence/' config/telephony.mk; #Replace the Messaging app with Silence
if [ "$DOS_HOST_GLIBC2_34" = true ]; then
#fix compile with glibc 2.34
#like 318916, but keeps 259778
sed -i 's|/usr/include:/usr/include/x86_64-linux-gnu|/usr/include/openssl|' config/BoardConfigKernel.mk;
sed -i 's|-L/usr/lib/x86_64-linux-gnu -L/usr/lib64|-L/usr/lib64/libcrypto.so -L/usr/lib64/libssl.so|' config/BoardConfigKernel.mk;
fi;
fi;
if enter "vendor/divested"; then

6
Scripts/LineageOS-18.1/Patch.sh
View file

@ -277,6 +277,12 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP
echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list
sed -i 's/messaging/Silence/' config/telephony.mk; #Replace the Messaging app with Silence
if [ "$DOS_HOST_GLIBC2_34" = true ]; then
#fix compile with glibc 2.34
#like 318916, but keeps 259778
sed -i 's|/usr/include:/usr/include/x86_64-linux-gnu|/usr/include/openssl|' config/BoardConfigKernel.mk;
sed -i 's|-L/usr/lib/x86_64-linux-gnu -L/usr/lib64|-L/usr/lib64/libcrypto.so -L/usr/lib64/libssl.so|' config/BoardConfigKernel.mk;
fi;
fi;
if enter "vendor/divested"; then

1
Scripts/init.sh
View file

@ -37,6 +37,7 @@ export DOS_TOR_WRAPPER="";
export DOS_MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll()
export DOS_MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick, extra, slow, full
export DOS_REFRESH_PATCHES=true; #Set true to refresh branch-specific patches on apply
export DOS_HOST_GLIBC2_34=true; #Set true to enable a glibc 2.34+ workaround XXX: hard-coded to Fedora 35 paths
#Deblobber
export DOS_DEBLOBBER_REMOVE_ACCESSORIES=true; #Set false to allow use of external accessories that depend on blobs