Commit 4bef9a2
0
plików
+0
dodanych
-0
usuniętych
@@ -1089,40 +1089,36 @@ build: |
1089
1089
1090
1090
cd ../glibc-${pkgver}
1091
1091
1092
- # glibc REFUZUJE kompilację bez optymalizacji ("glibc cannot be compiled
1093
- # without optimization"), a pagbuild narzuca CFLAGS bez -O i z -std=gnu17.
1094
- # Zerujemy środowiskowe flagi – configure ustawi własne (-g -O2).
1092
+ # Zerujemy flagi środowiskowe
1095
1093
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
1096
1094
1097
1095
patch -Np1 -i ../fhs-1.patch
1098
1096
patch -Np1 -i ../glibc-2.44-upstream_fix-1.patch
1099
1097
1098
+ # Kopiujemy plik wspieranych lokali przed wejściem do build/
1099
+ cp ../glibc.locales.supported localedata/SUPPORTED
1100
1100
1101
1101
mkdir ${PKGDIR}/lib64
1102
-
1103
1102
ln -s ../lib/ld-linux-x86-64.so.2 ${PKGDIR}/lib64
1104
1103
ln -s ../lib/ld-linux-x86-64.so.2 ${PKGDIR}/lib64/ld-lsb-x86-64.so.3
1105
1104
1106
1105
mkdir -v build
1107
- cd build
1106
+ cd build
1108
1107
1109
1108
echo "rootsbindir=/usr/bin" > configparms
1110
1109
echo "sbindir=/usr/bin" >> configparms
1111
1110
1112
1111
../configure --prefix=/usr \
1113
1112
--with-bugurl=https://github.com/NuTyX/x86_64/issues \
1114
- --disable-werror \
1115
- --enable-kernel=5.4 \
1113
+ --disable-werror \
1114
+ --enable-kernel=5.4 \
1116
1115
--with-headers=/usr/include \
1117
1116
--enable-stack-protector=strong \
1118
- --disable-nscd \
1117
+ --disable-nscd \
1119
1118
libc_cv_slibdir=/lib
1120
1119
1121
1120
make || make -j1
1122
1121
1123
- # make -k check 2>&1 | tee glibc-check-log
1124
- # grep Error glibc-check-log
1125
-
1126
1122
make install_root=${PKGDIR} install
1127
1123
1128
1124
mkdir -p ${PKGDIR}/etc
@@ -1133,9 +1129,6 @@ build: |
1133
1129
1134
1130
mkdir -pv ${PKGDIR}/usr/lib/locale
1135
1131
1136
- cp ./glibc.locales.supported \
1137
- ../localedata/SUPPORTED
1138
-
1139
1132
make install_root=${PKGDIR} localedata/install-locales
1140
1133
1141
1134
cat > ${PKGDIR}/etc/nsswitch.conf << "EOF"
@@ -1156,7 +1149,6 @@ build: |
1156
1149
# End /etc/nsswitch.conf
1157
1150
EOF
1158
1151
1159
-
1160
1152
cat > ${PKGDIR}/etc/ld.so.conf << "EOF"
1161
1153
# Begin /etc/ld.so.conf
1162
1154
/usr/local/lib
@@ -1164,7 +1156,7 @@ build: |
1164
1156
1165
1157
# Add an include directory
1166
1158
include /etc/ld.so.conf.d/*.conf
1167
- # End of /etc/ld.so.conf
1159
+ # End of /etc/ld.so.conf
1168
1160
EOF
1169
1161
1170
1162
mkdir ${PKGDIR}/etc/ld.so.conf.d