pktsurf/smlinux
1
1
Fork 0
Code Issues 1 Pull requests Wiki Activity

Upgraded base/libxml to version 2.13.4

Browse source 
Upgraded base/libxslt to version 1.1.42
Upgraded base/python3 to 3.9.20
Upgraded base/mdadm to 4.3
Fixed miscellaneous build files to putbstuff inside /usr
This commit is contained in:
PktSurf 2024-10-20 17:37:22 +05:30
parent e94a3391ea
commit 959de424b4
17 changed files with 943 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
base/libxml2/libxml2-2.12.0-python3-unicode-errors.patch Normal file
View file

@ -0,0 +1,34 @@
diff --git a/python/libxml.c b/python/libxml.c
index bf048006..5f42e5b7 100644
--- a/python/libxml.c
+++ b/python/libxml.c
@@ -1505,6 +1505,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg,
PyObject *message;
PyObject *result;
char str[1000];
+ unsigned char *ptr = (unsigned char *)str;
if (libxml_xmlPythonErrorFuncHandler == NULL) {
va_start(ap, msg);
@@ -1516,12 +1517,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg,
str[999] = 0;
va_end(ap);
+#if PY_MAJOR_VERSION >= 3
+ /* Ensure the error string doesn't start at UTF8 continuation. */
+ while (*ptr && (*ptr & 0xc0) == 0x80)
+ ptr++;
+#endif
+
list = PyTuple_New(2);
PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
- message = libxml_charPtrConstWrap(str);
+ message = libxml_charPtrConstWrap(ptr);
PyTuple_SetItem(list, 1, message);
result = PyObject_CallObject(libxml_xmlPythonErrorFuncHandler, list);
+ /* Forget any errors caused in the error handler. */
+ PyErr_Clear();
Py_XDECREF(list);
Py_XDECREF(result);
}

24
base/libxml2/libxml2.SMBuild
View file

@ -1,7 +1,7 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=libxml2
version=2.9.12
build=3sml
version=2.13.4
build=1sml
homepage="http://www.xmlsoft.org/"
download="ftp://xmlsoft.org/libxml2/libxml2-$version.tar.gz"
desc="XML parser library"
@ -14,17 +14,17 @@ prepbuilddir() {
tar xf $srcdir/$app-$version.tar.?z*
cd $app-$version
fixbuilddirpermissions
applypatch $srcdir/libxml2-2.9.8-python3-unicode-errors.patch
applypatch $srcdir/revert-Make-xmlFreeNodeList-non-recursive.patch
applypatch $srcdir/652dd12a858989b14eed4e84e453059cd3ba340e.diff
applypatch $srcdir/libxml2-2.12.0-python3-unicode-errors.patch
}
build() {
./configure \
--prefix= \
--enable-shared \
--disable-static
--prefix=/usr \
--sysconfdir=/etc \
--bindir=/bin \
--disable-static \
--with-legacy \
--with-history
make
make install DESTDIR=$pkg
@ -35,8 +35,6 @@ build() {
}
sha512sums="
7a2a9b03cc7a1f3ed3d64871818039bc3f658979c37d0e43685f400838c22c081c23a058b8599f1d27b4d3ea95cdbbb4f328fc541f27501cde5eacd2a9125546 libxml2-2.9.12.tar.lz
a205c97fa1488fb8907cfa08b5f82e2055c80b86213dc3cc5c4b526fe6aa786bcc4e4eeb226c44635a1d021307b39e3940f706c42fb60e9e3e9b490a84164df7 libxml2-2.9.8-python3-unicode-errors.patch
347178e432379d543683cba21b902e7305202c03e8dbd724ae395963d677096a5cfc4e345e208d498163ca5174683c167610fc2b297090476038bc2bb7c84b4f revert-Make-xmlFreeNodeList-non-recursive.patch
3cee30d3c190879e31f4bf27699b5a9ed2a8615982375078702150dbdf9171bf0527b48a63beaa79de6afee5725076fb5214c27235737ab9b42d869d1c3c8b1c 652dd12a858989b14eed4e84e453059cd3ba340e.diff
189fa85ccca63a39deb023c498935c8e2f2ff43abf7cf0948b981b76acf655a3002702a0fbd2ef08ec137581bef6f67c3f74aca1e0d4079fb6d58e48ed8cea24 libxml2-2.13.4.tar.lz
f5c468d1fe8dde30d6914d6cba2e1dd480cc491633c9915f94e37b543beda16c65ac0d658717837fa91b9ae358c7ce06565b240fd0d40897ea78d819a750ad56 libxml2-2.12.0-python3-unicode-errors.patch
"

11
base/libxslt/libxslt-increase-max-depth.diff Normal file
View file

@ -0,0 +1,11 @@
--- ./libxslt/transform.c.orig 2017-08-29 06:20:04.000000000 -0500
+++ ./libxslt/transform.c 2017-09-25 13:39:52.298942433 -0500
@@ -66,7 +66,7 @@
const xmlChar **systemID);
#endif
-int xsltMaxDepth = 3000;
+int xsltMaxDepth = 4000;
int xsltMaxVars = 15000;
/*

16
base/libxslt/libxslt.SMBuild
View file

@ -1,6 +1,6 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=libxslt
version=1.1.34
version=1.1.42
build=1sml
homepage="http://www.xmlsoft.org/"
download="ftp://xmlsoft.org/libxslt/libxslt-$version.tar.gz"
@ -15,15 +15,15 @@ prepbuilddir() {
cd $app-$version
fixbuilddirpermissions
# Thank you Arch Linux
applypatch $srcdir/0001-Make-generate-id-deterministic.patch
applypatch $srcdir/0002-Fix-manpage.patch
applypatch $srcdir/libxslt-increase-max-depth.diff
}
build() {
./configure \
--prefix= \
--disable-static
--prefix=/usr \
--bindir=/bin \
--disable-static \
--with-python=/bin/python
make
make install DESTDIR=$pkg
@ -34,7 +34,5 @@ build() {
}
sha512sums="
29d7edf7124cbe79858dda78f59a6ab080ab861ef877eb1ad241e63e31b8d77bd1637a6afb349ac71acff81eaa6b78d32bf124cf735d7656457f23d1c600c4ce libxslt-1.1.34.tar.lz
78bcec1a74ff5b480b50767ee95b57ad74ec777e1d909cd753a2380c221bf94bd089bfdc3d73ad1b9d443d56ae16813da6a0434f2ee42f4332d241056be3205e 0001-Make-generate-id-deterministic.patch
daa4e26d979bba79f55c42e5e5cec7368e8f666a17353aafe6276da41ab02d018994a8b1a667c28fe5a4c32a48cc8f284629d1f2097d3fb33339f6cde5f73e17 0002-Fix-manpage.patch
a6f6b73d9dfc2fddd216af9c1153fe04975c36d6ada04369e13666c49b09b93951cf166ce64be3119025d355bdd6b2045707cb1d0e18e15050c3d63c7f6ea3b1 libxslt-1.1.42.tar.lz
"

19
base/lua/lua.SMBuild
View file

@ -17,30 +17,33 @@ prepbuilddir() {
}
build() {
sed -i "s@#define LUA_ROOT\t"'"/usr/local/"@#define LUA_ROOT "/"@' src/luaconf.h
sed -i 's@INSTALL_TOP= /usr/local@INSTALL_TOP='"$dest"'@' Makefile
sed -i "s@#define LUA_ROOT\t"'"/usr/local/"@#define LUA_ROOT "/usr"@' src/luaconf.h
sed -i 's@INSTALL_TOP= /usr/local@INSTALL_TOP='"$pkg/usr"'@' Makefile
sed -i 's@INSTALL_LMOD=@#INSTALL_LMOD=@' Makefile
sed -i 's@INSTALL_CMOD=@#INSTALL_LMOD=@' Makefile
make linux CFLAGS="$CFLAGS"
make linux install \
CFLAGS="$CFLAGS" \
INSTALL_TOP="$pkg" \
INSTALL_MAN="$pkg/share/man/man1"
INSTALL_BIN="$pkg/bin" \
INSTALL_MAN="$pkg/usr/share/man/man1"
# Build the shared library
mkdir -p shared && cd shared
ar -x $pkg/lib/liblua.a
ar -x $pkg/usr/lib/liblua.a
gcc -lreadline -lhistory -lncurses -lm -ldl -shared *.o -o liblua.so.$version
cp -a liblua.so.$version $pkg/lib/
( cd $pkg/lib
cp -a liblua.so.$version $pkg/usr/lib/
(
cd $pkg/usr/lib
ln -s liblua.so.$version liblua.so.5.1
ln -s liblua.so.$version liblua.so.5
ln -s liblua.so.$version liblua.so
)
cd ..
install -Dm 644 $srcdir/lua.pc $pkg/usr/share/pkgconfig/lua.pc
cp COPYRIGHT $pkgdocs/
install -Dm 644 etc/lua.pc $pkg/lib/pkgconfig/lua.pc
mkfinalpkg
}

11
base/lua/lua.pc Normal file
View file

@ -0,0 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: Lua
Description: An Extensible Extension Language
Version: 5.1.5
Requires:
Libs: -L${libdir} -llua -lm
Cflags: -I${includedir}

41
base/mdadm/Create.c-fix-build.patch Normal file
View file

@ -0,0 +1,41 @@
From 52bead95d2957437c691891fcdc49bd6afccdd49 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 12 Apr 2024 18:45:13 +0200
Subject: [PATCH] Create.c: fix uclibc build
Define FALLOC_FL_ZERO_RANGE if needed as FALLOC_FL_ZERO_RANGE is only
defined for aarch64 on uclibc-ng resulting in the following or1k build
failure since commit 577fd10486d8d1472a6b559066f344ac30a3a391:
Create.c: In function 'write_zeroes_fork':
Create.c:155:35: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function)
155 | if (fallocate(fd, FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE,
| ^~~~~~~~~~~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/0e04bcdb591ca5642053e1f7e31384f06581e989
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
---
Create.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Create.c b/Create.c
index 4397ff49..d94253b1 100644
--- a/Create.c
+++ b/Create.c
@@ -32,6 +32,10 @@
#include <sys/signalfd.h>
#include <sys/wait.h>
+#ifndef FALLOC_FL_ZERO_RANGE
+#define FALLOC_FL_ZERO_RANGE 16
+#endif
+
static int round_size_and_verify(unsigned long long *size, int chunk)
{
if (*size == 0)
--
2.45.0

17
base/mdadm/basename.patch Normal file
View file

@ -0,0 +1,17 @@
--- a/mdadm.h
+++ b/mdadm.h
@@ -248,6 +248,14 @@ static inline void __put_unaligned32(__u
}
/*
+ * Ensure GNU basename behavior for musl libc
+ */
+#ifndef __GLIBC__
+#define basename(path) \
+ (strrchr((path),'/') ? strrchr((path),'/')+1 : (path))
+#endif
+
+/*
* Check at compile time that something is of a particular type.
* Always evaluates to 1 so you may use it easily in comparisons.
*/

16
base/mdadm/fix-monitor-tv_sec.patch Normal file
View file

@ -0,0 +1,16 @@
diff --git monitor.c monitor.c
index 81537ed..08027ac 100644
--- a/monitor.c
+++ b/monitor.c
@@ -449,9 +449,9 @@ static int read_and_act(struct active_array *a, fd_set *fds)
}
gettimeofday(&tv, NULL);
- dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
+ dprintf("(%d): %lld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
a->info.container_member,
- tv.tv_sec, tv.tv_usec,
+ (long long)tv.tv_sec, (long)tv.tv_usec,
array_states[a->curr_state],
array_states[a->prev_state],
sync_actions[a->curr_action],

629
base/mdadm/lfs64.patch Normal file
View file

@ -0,0 +1,629 @@
needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc
--
diff --git a/Grow.c b/Grow.c
index 9c6fc95..bb21333 100644
--- a/Grow.c
+++ b/Grow.c
@@ -4268,10 +4268,10 @@ static int grow_backup(struct mdinfo *sr
bsb.magic[15] = '2';
for (i = 0; i < dests; i++)
if (part)
- lseek64(destfd[i], destoffsets[i] +
+ lseek(destfd[i], destoffsets[i] +
__le64_to_cpu(bsb.devstart2)*512, 0);
else
- lseek64(destfd[i], destoffsets[i], 0);
+ lseek(destfd[i], destoffsets[i], 0);
rv = save_stripes(sources, offsets, disks, chunk, level, layout,
dests, destfd, offset * 512 * odata,
@@ -4290,14 +4290,14 @@ static int grow_backup(struct mdinfo *sr
((char*)&bsb.sb_csum2)-((char*)&bsb));
rv = -1;
- if ((unsigned long long)lseek64(destfd[i],
+ if ((unsigned long long)lseek(destfd[i],
destoffsets[i] - 4096, 0) !=
destoffsets[i] - 4096)
break;
if (write(destfd[i], &bsb, 512) != 512)
break;
if (destoffsets[i] > 4096) {
- if ((unsigned long long)lseek64(destfd[i], destoffsets[i]+stripes*chunk*odata, 0) !=
+ if ((unsigned long long)lseek(destfd[i], destoffsets[i]+stripes*chunk*odata, 0) !=
destoffsets[i]+stripes*chunk*odata)
break;
if (write(destfd[i], &bsb, 512) != 512)
@@ -4347,7 +4347,7 @@ static int forget_backup(int dests, int
if (memcmp(bsb.magic, "md_backup_data-2", 16) == 0)
bsb.sb_csum2 = bsb_csum((char*)&bsb,
((char*)&bsb.sb_csum2)-((char*)&bsb));
- if ((unsigned long long)lseek64(destfd[i], destoffsets[i]-4096, 0) !=
+ if ((unsigned long long)lseek(destfd[i], destoffsets[i]-4096, 0) !=
destoffsets[i]-4096)
rv = -1;
if (rv == 0 && write(destfd[i], &bsb, 512) != 512)
@@ -4375,7 +4375,7 @@ static void validate(int afd, int bfd, u
*/
if (afd < 0)
return;
- lseek64(bfd, offset - 4096, 0);
+ lseek(bfd, offset - 4096, 0);
if (read(bfd, &bsb2, 512) != 512)
fail("cannot read bsb");
if (bsb2.sb_csum != bsb_csum((char*)&bsb2,
@@ -4406,12 +4406,12 @@ static void validate(int afd, int bfd, u
}
}
- lseek64(bfd, offset, 0);
+ lseek(bfd, offset, 0);
if ((unsigned long long)read(bfd, bbuf, len) != len) {
//printf("len %llu\n", len);
fail("read first backup failed");
}
- lseek64(afd, __le64_to_cpu(bsb2.arraystart)*512, 0);
+ lseek(afd, __le64_to_cpu(bsb2.arraystart)*512, 0);
if ((unsigned long long)read(afd, abuf, len) != len)
fail("read first from array failed");
if (memcmp(bbuf, abuf, len) != 0) {
@@ -4439,10 +4439,10 @@ static void validate(int afd, int bfd, u
bbuf = xmalloc(abuflen);
}
- lseek64(bfd, offset+__le64_to_cpu(bsb2.devstart2)*512, 0);
+ lseek(bfd, offset+__le64_to_cpu(bsb2.devstart2)*512, 0);
if ((unsigned long long)read(bfd, bbuf, len) != len)
fail("read second backup failed");
- lseek64(afd, __le64_to_cpu(bsb2.arraystart2)*512, 0);
+ lseek(afd, __le64_to_cpu(bsb2.arraystart2)*512, 0);
if ((unsigned long long)read(afd, abuf, len) != len)
fail("read second from array failed");
if (memcmp(bbuf, abuf, len) != 0)
@@ -4719,7 +4719,7 @@ int Grow_restart(struct supertype *st, s
st->ss->getinfo_super(st, &dinfo, NULL);
st->ss->free_super(st);
- if (lseek64(fd,
+ if (lseek(fd,
(dinfo.data_offset + dinfo.component_size - 8) <<9,
0) < 0) {
pr_err("Cannot seek on device %d\n", i);
@@ -4819,7 +4819,7 @@ int Grow_restart(struct supertype *st, s
goto nonew; /* No new data here */
}
}
- if (lseek64(fd, __le64_to_cpu(bsb.devstart)*512, 0)< 0) {
+ if (lseek(fd, __le64_to_cpu(bsb.devstart)*512, 0)< 0) {
second_fail:
if (verbose)
pr_err("Failed to verify secondary backup-metadata block on %s\n",
@@ -4827,7 +4827,7 @@ int Grow_restart(struct supertype *st, s
continue; /* Cannot seek */
}
/* There should be a duplicate backup superblock 4k before here */
- if (lseek64(fd, -4096, 1) < 0 ||
+ if (lseek(fd, -4096, 1) < 0 ||
read(fd, &bsb2, sizeof(bsb2)) != sizeof(bsb2))
goto second_fail; /* Cannot find leading superblock */
if (bsb.magic[15] == '1')
--- a/raid6check.c
+++ b/raid6check.c
@@ -211,7 +211,7 @@ int autorepair(int *disk, unsigned long
for(j = 0; j < (chunk_size >> CHECK_PAGE_BITS); j++) {
if(page_to_write[j] == 1) {
int slot = block_index_for_slot[disk[j]];
- lseek64(source[slot], offsets[slot] + start * chunk_size + j * CHECK_PAGE_SIZE, SEEK_SET);
+ lseek(source[slot], offsets[slot] + start * chunk_size + j * CHECK_PAGE_SIZE, SEEK_SET);
write_res += write(source[slot],
blocks[disk[j]] + j * CHECK_PAGE_SIZE,
CHECK_PAGE_SIZE);
@@ -284,9 +284,9 @@ int manual_repair(int chunk_size, int sy
}
int write_res1, write_res2;
- off64_t seek_res;
+ off_t seek_res;
- seek_res = lseek64(source[fd1],
+ seek_res = lseek(source[fd1],
offsets[fd1] + start * chunk_size, SEEK_SET);
if (seek_res < 0) {
fprintf(stderr, "lseek failed for failed_disk1\n");
@@ -294,7 +294,7 @@ int manual_repair(int chunk_size, int sy
}
write_res1 = write(source[fd1], blocks[failed_slot1], chunk_size);
- seek_res = lseek64(source[fd2],
+ seek_res = lseek(source[fd2],
offsets[fd2] + start * chunk_size, SEEK_SET);
if (seek_res < 0) {
fprintf(stderr, "lseek failed for failed_disk2\n");
@@ -379,7 +379,7 @@ int check_stripes(struct mdinfo *info, i
goto exitCheck;
}
for (i = 0 ; i < raid_disks ; i++) {
- off64_t seek_res = lseek64(source[i], offsets[i] + start * chunk_size,
+ off_t seek_res = lseek(source[i], offsets[i] + start * chunk_size,
SEEK_SET);
if (seek_res < 0) {
fprintf(stderr, "lseek to source %d failed\n", i);
--- a/restripe.c
+++ b/restripe.c
@@ -581,7 +581,7 @@ int save_stripes(int *source, unsigned long long *offsets,
raid_disks, level, layout);
if (dnum < 0) abort();
if (source[dnum] < 0 ||
- lseek64(source[dnum],
+ lseek(source[dnum],
offsets[dnum] + offset, 0) < 0 ||
read(source[dnum], buf+disk * chunk_size,
chunk_size) != chunk_size) {
@@ -754,8 +754,8 @@ int restore_stripes(int *dest, unsigned long long *offsets,
raid_disks, level, layout);
if (src_buf == NULL) {
/* read from file */
- if (lseek64(source, read_offset, 0) !=
- (off64_t)read_offset) {
+ if (lseek(source, read_offset, 0) !=
+ (off_t)read_offset) {
rv = -1;
goto abort;
}
@@ -816,7 +816,7 @@ int restore_stripes(int *dest, unsigned long long *offsets,
}
for (i=0; i < raid_disks ; i++)
if (dest[i] >= 0) {
- if (lseek64(dest[i],
+ if (lseek(dest[i],
offsets[i]+offset, 0) < 0) {
rv = -1;
goto abort;
@@ -866,7 +866,7 @@ int test_stripes(int *source, unsigned long long *offsets,
int disk;
for (i = 0 ; i < raid_disks ; i++) {
- if ((lseek64(source[i], offsets[i]+start, 0) < 0) ||
+ if ((lseek(source[i], offsets[i]+start, 0) < 0) ||
(read(source[i], stripes[i], chunk_size) !=
chunk_size)) {
free(q);
diff --git a/super-ddf.c b/super-ddf.c
index 3f304cd..7b10568 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -809,7 +809,7 @@ static int load_ddf_header(int fd, unsig
if (lba >= size-1)
return 0;
- if (lseek64(fd, lba<<9, 0) < 0)
+ if (lseek(fd, lba<<9, 0) < 0)
return 0;
if (read(fd, hdr, 512) != 512)
@@ -863,7 +863,7 @@ static void *load_section(int fd, struct
else
offset += be64_to_cpu(super->active->secondary_lba);
- if ((unsigned long long)lseek64(fd, offset<<9, 0) != (offset<<9)) {
+ if ((unsigned long long)lseek(fd, offset<<9, 0) != (offset<<9)) {
if (dofree)
free(buf);
return NULL;
@@ -882,7 +882,7 @@ static int load_ddf_headers(int fd, stru
get_dev_size(fd, NULL, &dsize);
- if (lseek64(fd, dsize-512, 0) < 0) {
+ if (lseek(fd, dsize-512, 0) < 0) {
if (devname)
pr_err("Cannot seek to anchor block on %s: %s\n",
devname, strerror(errno));
@@ -1689,7 +1689,7 @@ static int copy_metadata_ddf(struct supe
if (!get_dev_size(from, NULL, &dsize))
goto err;
- if (lseek64(from, dsize-512, 0) < 0)
+ if (lseek(from, dsize-512, 0) < 0)
goto err;
if (read(from, buf, 512) != 512)
goto err;
@@ -1708,8 +1708,8 @@ static int copy_metadata_ddf(struct supe
bytes = dsize - offset;
- if (lseek64(from, offset, 0) < 0 ||
- lseek64(to, offset, 0) < 0)
+ if (lseek(from, offset, 0) < 0 ||
+ lseek(to, offset, 0) < 0)
goto err;
while (written < bytes) {
int n = bytes - written;
@@ -2967,7 +2967,7 @@ static int __write_ddf_structure(struct
header->openflag = 1;
header->crc = calc_crc(header, 512);
- lseek64(fd, sector<<9, 0);
+ lseek(fd, sector<<9, 0);
if (write(fd, header, 512) < 0)
goto out;
@@ -3031,7 +3031,7 @@ out:
header->openflag = 0;
header->crc = calc_crc(header, 512);
- lseek64(fd, sector<<9, 0);
+ lseek(fd, sector<<9, 0);
if (write(fd, header, 512) < 0)
ret = 0;
@@ -3084,7 +3084,7 @@ static int _write_super_to_disk(struct d
if (!__write_ddf_structure(d, ddf, DDF_HEADER_SECONDARY))
return 0;
- lseek64(fd, (size-1)*512, SEEK_SET);
+ lseek(fd, (size-1)*512, SEEK_SET);
if (write(fd, &ddf->anchor, 512) < 0)
return 0;
@@ -3836,7 +3836,7 @@ static int store_super_ddf(struct supert
return 1;
memset(buf, 0, 512);
- lseek64(fd, dsize-512, 0);
+ lseek(fd, dsize-512, 0);
rc = write(fd, buf, 512);
free(buf);
if (rc < 0)
--- a/super-intel.c
+++ b/super-intel.c
@@ -3195,7 +3195,7 @@ static int read_imsm_migr_rec(int fd, st
unsigned long long dsize;
get_dev_size(fd, NULL, &dsize);
- if (lseek64(fd, dsize - (sector_size*MIGR_REC_SECTOR_POSITION),
+ if (lseek(fd, dsize - (sector_size*MIGR_REC_SECTOR_POSITION),
SEEK_SET) < 0) {
pr_err("Cannot seek to anchor block: %s\n",
strerror(errno));
@@ -3386,7 +3386,7 @@ static int write_imsm_migr_rec(struct su
continue;
get_dev_size(sd->fd, NULL, &dsize);
- if (lseek64(sd->fd, dsize - (MIGR_REC_SECTOR_POSITION *
+ if (lseek(sd->fd, dsize - (MIGR_REC_SECTOR_POSITION *
sector_size),
SEEK_SET) < 0) {
pr_err("Cannot seek to anchor block: %s\n",
@@ -4511,7 +4511,7 @@ static int load_imsm_mpb(int fd, struct
return 1;
}
- if (lseek64(fd, dsize - (sector_size * 2), SEEK_SET) < 0) {
+ if (lseek(fd, dsize - (sector_size * 2), SEEK_SET) < 0) {
if (devname)
pr_err("Cannot seek to anchor block on %s: %s\n",
devname, strerror(errno));
@@ -4580,7 +4580,7 @@ static int load_imsm_mpb(int fd, struct
}
/* read the extended mpb */
- if (lseek64(fd, dsize - (sector_size * (2 + sectors)), SEEK_SET) < 0) {
+ if (lseek(fd, dsize - (sector_size * (2 + sectors)), SEEK_SET) < 0) {
if (devname)
pr_err("Cannot seek to extended mpb on %s: %s\n",
devname, strerror(errno));
@@ -6111,7 +6111,7 @@ static int add_to_super_imsm(struct supe
/* clear migr_rec when adding disk to container */
memset(super->migr_rec_buf, 0, MIGR_REC_BUF_SECTORS*MAX_SECTOR_SIZE);
- if (lseek64(fd, size - MIGR_REC_SECTOR_POSITION*member_sector_size,
+ if (lseek(fd, size - MIGR_REC_SECTOR_POSITION*member_sector_size,
SEEK_SET) >= 0) {
if ((unsigned int)write(fd, super->migr_rec_buf,
MIGR_REC_BUF_SECTORS*member_sector_size) !=
@@ -6336,7 +6336,7 @@ static int write_super_imsm(struct super
unsigned long long dsize;
get_dev_size(d->fd, NULL, &dsize);
- if (lseek64(d->fd, dsize - sector_size,
+ if (lseek(d->fd, dsize - sector_size,
SEEK_SET) >= 0) {
if ((unsigned int)write(d->fd,
super->migr_rec_buf,
@@ -6419,7 +6419,7 @@ static int write_ppl_header(unsigned lon
ppl_hdr->checksum = __cpu_to_le32(~crc32c_le(~0, buf, PPL_HEADER_SIZE));
- if (lseek64(fd, ppl_sector * 512, SEEK_SET) < 0) {
+ if (lseek(fd, ppl_sector * 512, SEEK_SET) < 0) {
ret = -errno;
perror("Failed to seek to PPL header location");
return ret;
@@ -6513,7 +6513,7 @@ static int validate_ppl_imsm(struct supe
dprintf("Checking potential PPL at offset: %llu\n", ppl_offset);
- if (lseek64(d->fd, info->ppl_sector * 512 + ppl_offset,
+ if (lseek(d->fd, info->ppl_sector * 512 + ppl_offset,
SEEK_SET) < 0) {
perror("Failed to seek to PPL header location");
ret = -1;
@@ -9022,7 +9022,7 @@ static int store_imsm_mpb(int fd, struct
sectors = mpb_sectors(mpb, sector_size) - 1;
/* write the extended mpb to the sectors preceeding the anchor */
- if (lseek64(fd, dsize - (sector_size * (2 + sectors)),
+ if (lseek(fd, dsize - (sector_size * (2 + sectors)),
SEEK_SET) < 0)
return 1;
@@ -9032,7 +9032,7 @@ static int store_imsm_mpb(int fd, struct
}
/* first block is stored on second to last sector of the disk */
- if (lseek64(fd, dsize - (sector_size * 2), SEEK_SET) < 0)
+ if (lseek(fd, dsize - (sector_size * 2), SEEK_SET) < 0)
return 1;
if ((unsigned int)write(fd, buf, sector_size) != sector_size)
@@ -11213,7 +11213,7 @@ int recover_backup_imsm(struct supertype
skipped_disks++;
continue;
}
- if (lseek64(dl_disk->fd, read_offset, SEEK_SET) < 0) {
+ if (lseek(dl_disk->fd, read_offset, SEEK_SET) < 0) {
pr_err("Cannot seek to block: %s\n",
strerror(errno));
skipped_disks++;
@@ -11225,7 +11225,7 @@ int recover_backup_imsm(struct supertype
skipped_disks++;
continue;
}
- if (lseek64(dl_disk->fd, write_offset, SEEK_SET) < 0) {
+ if (lseek(dl_disk->fd, write_offset, SEEK_SET) < 0) {
pr_err("Cannot seek to block: %s\n",
strerror(errno));
skipped_disks++;
@@ -12473,7 +12473,7 @@ static int imsm_manage_reshape(
unsigned long long dsize;
get_dev_size(d->fd, NULL, &dsize);
- if (lseek64(d->fd, dsize - MIGR_REC_SECTOR_POSITION*sector_size,
+ if (lseek(d->fd, dsize - MIGR_REC_SECTOR_POSITION*sector_size,
SEEK_SET) >= 0) {
if ((unsigned int)write(d->fd, super->migr_rec_buf,
MIGR_REC_BUF_SECTORS*sector_size) !=
@@ -12629,7 +12629,7 @@ static int validate_internal_bitmap_for_
}
}
- if (lseek64(fd, offset * super->sector_size, SEEK_SET) < 0)
+ if (lseek(fd, offset * super->sector_size, SEEK_SET) < 0)
goto abort;
if (read(fd, read_buf, IMSM_BITMAP_HEADER_SIZE) !=
IMSM_BITMAP_HEADER_SIZE)
@@ -12747,7 +12747,7 @@ static int locate_bitmap_imsm(struct sup
offset = get_bitmap_header_sector(super, super->current_vol);
dprintf("bitmap header offset is %llu\n", offset);
- lseek64(fd, offset << 9, 0);
+ lseek(fd, offset << 9, 0);
return 0;
}
@@ -12801,7 +12801,7 @@ static int write_init_bitmap_imsm(struct
return -1;
memset(buf, 0xFF, MAX_SECTOR_SIZE);
offset = get_bitmap_sector(super, vol_idx);
- lseek64(fd, offset << 9, 0);
+ lseek(fd, offset << 9, 0);
while (written < IMSM_BITMAP_AREA_SIZE) {
to_write = IMSM_BITMAP_AREA_SIZE - written;
if (to_write > MAX_SECTOR_SIZE)
--- a/super0.c
+++ b/super0.c
@@ -327,12 +327,12 @@ static int copy_metadata0(struct superty
offset *= 512;
- if (lseek64(from, offset, 0) < 0LL)
+ if (lseek(from, offset, 0) < 0LL)
goto err;
if (read(from, buf, bufsize) != bufsize)
goto err;
- if (lseek64(to, offset, 0) < 0LL)
+ if (lseek(to, offset, 0) < 0LL)
goto err;
super = buf;
if (super->md_magic != MD_SB_MAGIC ||
@@ -885,7 +885,7 @@ static int store_super0(struct supertype
offset = dsize/512 - 8*2;
offset &= ~(4*2-1);
offset *= 512;
- if (lseek64(fd, offset, 0)< 0LL)
+ if (lseek(fd, offset, 0)< 0LL)
ret = 3;
else if (write(fd, st->other, 1024) != 1024)
ret = 4;
@@ -900,7 +900,7 @@ static int store_super0(struct supertype
offset *= 512;
- if (lseek64(fd, offset, 0)< 0LL)
+ if (lseek(fd, offset, 0)< 0LL)
return 3;
if (write(fd, super, sizeof(*super)) != sizeof(*super))
@@ -1027,7 +1027,7 @@ static int load_super0(struct supertype
offset *= 512;
- if (lseek64(fd, offset, 0)< 0LL) {
+ if (lseek(fd, offset, 0)< 0LL) {
if (devname)
pr_err("Cannot seek to superblock on %s: %s\n",
devname, strerror(errno));
@@ -1212,7 +1212,7 @@ static int locate_bitmap0(struct superty
offset += MD_SB_BYTES;
- lseek64(fd, offset, 0);
+ lseek(fd, offset, 0);
return 0;
}
@@ -1237,7 +1237,7 @@ static int write_bitmap0(struct supertyp
offset *= 512;
- if (lseek64(fd, offset + 4096, 0)< 0LL)
+ if (lseek(fd, offset + 4096, 0)< 0LL)
return 3;
if (posix_memalign(&buf, 4096, 4096))
--- a/super1.c
+++ b/super1.c
@@ -745,7 +745,7 @@ static int copy_metadata1(struct superty
goto err;
}
- if (lseek64(from, sb_offset << 9, 0) < 0LL)
+ if (lseek(from, sb_offset << 9, 0) < 0LL)
goto err;
if (read(from, buf, bufsize) != bufsize)
goto err;
@@ -759,7 +759,7 @@ static int copy_metadata1(struct superty
calc_sb_1_csum(sb) != super.sb_csum)
goto err;
- if (lseek64(to, sb_offset << 9, 0) < 0LL)
+ if (lseek(to, sb_offset << 9, 0) < 0LL)
goto err;
if (write(to, buf, bufsize) != bufsize)
goto err;
@@ -775,9 +775,9 @@ static int copy_metadata1(struct superty
bitmap_offset += (int32_t)__le32_to_cpu(super.bitmap_offset);
- if (lseek64(from, bitmap_offset<<9, 0) < 0)
+ if (lseek(from, bitmap_offset<<9, 0) < 0)
goto err;
- if (lseek64(to, bitmap_offset<<9, 0) < 0)
+ if (lseek(to, bitmap_offset<<9, 0) < 0)
goto err;
for (written = 0; written < bytes ; ) {
@@ -816,9 +816,9 @@ static int copy_metadata1(struct superty
bb_offset += (int32_t)__le32_to_cpu(super.bblog_offset);
- if (lseek64(from, bb_offset<<9, 0) < 0)
+ if (lseek(from, bb_offset<<9, 0) < 0)
goto err;
- if (lseek64(to, bb_offset<<9, 0) < 0)
+ if (lseek(to, bb_offset<<9, 0) < 0)
goto err;
for (written = 0; written < bytes ; ) {
@@ -920,7 +920,7 @@ static int examine_badblocks_super1(stru
offset = __le64_to_cpu(sb->super_offset) +
(int)__le32_to_cpu(sb->bblog_offset);
offset <<= 9;
- if (lseek64(fd, offset, 0) < 0) {
+ if (lseek(fd, offset, 0) < 0) {
pr_err("Cannot seek to bad-blocks list\n");
return 1;
}
@@ -1810,7 +1810,7 @@ static int store_super1(struct supertype
abort();
}
- if (lseek64(fd, sb_offset << 9, 0)< 0LL)
+ if (lseek(fd, sb_offset << 9, 0)< 0LL)
return 3;
sbsize = ROUND_UP(sizeof(*sb) + 2 * __le32_to_cpu(sb->max_dev), 512);
@@ -1879,7 +1879,7 @@ static int write_init_ppl1(struct supert
sizeof(sb->set_uuid)));
ppl_hdr->checksum = __cpu_to_le32(~crc32c_le(~0, buf, PPL_HEADER_SIZE));
- if (lseek64(fd, info->ppl_sector * 512, SEEK_SET) < 0) {
+ if (lseek(fd, info->ppl_sector * 512, SEEK_SET) < 0) {
ret = errno;
perror("Failed to seek to PPL header location");
}
@@ -1924,7 +1924,7 @@ static int write_empty_r5l_meta_block(st
crc = crc32c_le(crc, (void *)mb, META_BLOCK_SIZE);
mb->checksum = crc;
- if (lseek64(fd, __le64_to_cpu(sb->data_offset) * 512, 0) < 0LL) {
+ if (lseek(fd, __le64_to_cpu(sb->data_offset) * 512, 0) < 0LL) {
pr_err("cannot seek to offset of the meta block\n");
goto fail_to_write;
}
@@ -2290,7 +2290,7 @@ static int load_super1(struct supertype
return -EINVAL;
}
- if (lseek64(fd, sb_offset << 9, 0)< 0LL) {
+ if (lseek(fd, sb_offset << 9, 0)< 0LL) {
if (devname)
pr_err("Cannot seek to superblock on %s: %s\n",
devname, strerror(errno));
@@ -2675,7 +2675,7 @@ static int locate_bitmap1(struct superty
}
if (mustfree)
free(sb);
- lseek64(fd, offset<<9, 0);
+ lseek(fd, offset<<9, 0);
return ret;
}
--- a/swap_super.c
+++ b/swap_super.c
@@ -16,7 +16,7 @@
#define MD_NEW_SIZE_SECTORS(x) ((x & ~(MD_RESERVED_SECTORS - 1)) - MD_RESERVED_SECTORS)
-extern long long lseek64(int, long long, int);
+extern long long lseek(int, long long, int);
int main(int argc, char *argv[])
{
@@ -38,8 +38,8 @@ int main(int argc, char *argv[])
exit(1);
}
offset = MD_NEW_SIZE_SECTORS(size) * 512LL;
- if (lseek64(fd, offset, 0) < 0LL) {
- perror("lseek64");
+ if (lseek(fd, offset, 0) < 0LL) {
+ perror("lseek");
exit(1);
}
if (read(fd, super, 4096) != 4096) {
@@ -68,8 +68,8 @@ int main(int argc, char *argv[])
super[32*4+10*4 +i] = t;
}
- if (lseek64(fd, offset, 0) < 0LL) {
- perror("lseek64");
+ if (lseek(fd, offset, 0) < 0LL) {
+ perror("lseek");
exit(1);
}
if (write(fd, super, 4096) != 4096) {
diff --git a/util.c b/util.c
index 3d05d07..6109fd4 100644
--- a/util.c
+++ b/util.c
@@ -2387,7 +2387,7 @@ int zero_disk_range(int fd, unsigned lon
return -1;
}
- if (lseek64(fd, sector * 512, SEEK_SET) < 0) {
+ if (lseek(fd, sector * 512, SEEK_SET) < 0) {
ret = -errno;
pr_err("Failed to seek offset for zeroing\n");
goto out;

10
base/mdadm/mdadm-include-sysmacros.patch Normal file
View file

@ -0,0 +1,10 @@
--- a/mdadm.h
+++ b/mdadm.h
@@ -35,6 +35,7 @@ extern __off64_t lseek64 __P ((int __fd,
#include <assert.h>
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <sys/stat.h>
#include <stdarg.h>
#include <stdint.h>

25
base/mdadm/mdadm.SMBuild
View file

@ -1,6 +1,6 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=mdadm
version=4.0
version=4.3
build=1sml
homepage="https://git.kernel.org/cgit/utils/mdadm"
download="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/snapshot/mdadm-$version.tar.gz"
@ -14,24 +14,27 @@ prepbuilddir() {
tar xf $srcdir/$app-$version.tar.?z*
cd $app-$version
fixbuilddirpermissions
# Thank you alpine linux
applypatch $srcdir/Create.c-fix-build.patch
applypatch $srcdir/basename.patch
applypatch $srcdir/fix-monitor-tv_sec.patch
applypatch $srcdir/mdadm-include-sysmacros.patch
applypatch $srcdir/no-werror.patch
applypatch $srcdir/util.c-include-limits.h.patch
applypatch $srcdir/lfs64.patch
}
build() {
make STRIP= \
CHECK_RUN_DIR=0 \
CC="$CC -include sys/sysmacros.h" \
CWFLAGS="$CFLAGS -Wall" \
MANDIR="/share/man" \
BINDIR="/bin" \
RUNDIR="/var/run/mdadm" \
UDEVDIR="/etc/udev" \
DESTDIR="$pkg" all install
make
make install BINDIR=/bin DESTDIR="$pkg"
install -Dm 644 mdadm.conf-example $pkg/etc/mdadm.conf.new
cp COPYING $pkgdocs/
mkfinalpkg
}
sha512sums="
ad35d0e80f5ff42f0cd853a742d78b1cc51edb2fea285881bcb3c81e5830e220984b7c1bb6c5a645c51ed5cfa72ad18e23603b8c9ca5cc959a01ae17a86e65d9 mdadm-4.0.tar.lz
b5fb0fa1539c17685748a9d334b659317cf957e00ee596dcc89576c0ba5cf2dcd71336b2cfd7ae93b0b99c4edf524352c9459cb5cd947629abe185bc9b2ab0f7 mdadm-4.3.tar.lz
"

11
base/mdadm/no-werror.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ ifeq ($(origin CC),default)
CC := $(CROSS_COMPILE)gcc
endif
CXFLAGS ?= -ggdb
-CWFLAGS ?= -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds
+CWFLAGS ?= -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds
ifdef WARN_UNUSED
CWFLAGS += -Wp -O3
endif

29
base/mdadm/util.c-include-limits.h.patch Normal file
View file

@ -0,0 +1,29 @@
From 8bda86099089b44129ef6206764f9de47a45f0db Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 12 Mar 2024 11:01:50 +0100
Subject: [PATCH] util.c: add limits.h include for NAME_MAX definition
Add limits.h include for NAME_MAX definition.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
---
util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util.c b/util.c
index 05ad3343..49a9c6e2 100644
--- a/util.c
+++ b/util.c
@@ -36,7 +36,7 @@
#include <ctype.h>
#include <dirent.h>
#include <dlfcn.h>
-
+#include <limits.h>
/*
* following taken from linux/blkpg.h because they aren't
--
2.45.0

5
base/python3/musl-find_library.patch
View file

@ -1,5 +1,6 @@
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
diff -ru Python-2.7.12.orig/Lib/ctypes/util.py Python-2.7.12/Lib/ctypes/util.py
--- Python-2.7.12.orig/Lib/ctypes/util.py 2016-06-26 00:49:30.000000000 +0300
+++ Python-2.7.12/Lib/ctypes/util.py 2016-11-03 16:05:46.954665040 +0200
@@ -204,6 +204,41 @@
def find_library(name, is64 = False):
return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))

24
base/python3/python3.SMBuild
View file

@ -1,6 +1,6 @@
# Maintainer: PktSurf <smlinux@pktsurf.in>
app=python3
version=3.9.16
version=3.9.20
build=1sml
homepage="https://www.python.org/"
download="https://www.python.org/ftp/python/$version/Python-$version.tar.xz"
@ -17,24 +17,23 @@ prepbuilddir() {
fixbuilddirpermissions
applypatch $srcdir/musl-find_library.patch
sed -i "s|^#.* /usr/local/bin/python|#!/bin/python3|" Lib/cgi.py
find . -name "*.py" -exec \
sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/bin/env python3|" {} +
applypatch $srcdir/python3.no-static-library.diff
}
build() {
LDFLAGS="-lncursesw -lterminfo" \
./configure \
--prefix=/usr \
--bindir=/bin \
--with-system-expat \
--with-system-ffi \
--without-cxx-main \
--without-ensurepip \
--enable-shared
--enable-shared \
--enable-ipv6 \
--enable-loadable-sqlite-extensions
make $MAKEFLAGS
make install DESTDIR=$pkg
make -j1 install maninstall DESTDIR=$pkg
cp LICENSE $pkgdocs/
@ -42,17 +41,20 @@ build() {
unittest/test tkinter/test \
bsddb/test json/tests lib2to3/tests\
distutils/tests tests ; do
rm -rf "$pkg"/lib/python3.9/"$test"
rm -rf "$pkg"/usr/lib/python3.9/"$test"
done
(
cd $pkg/usr/bin ; ln -s python3 python
cd $pkg/bin ; ln -s python3 python
)
mkfinalpkg
}
sha512sums="
e658b0d59b5cfdc591d626e8282b9945759f27ee6fbc8bcb8670737db32ffc11fb832dfed9b0e80188fb5f7f3f39fe6dd6191ab7736376453c9e248321e9b063 Python-3.12.6.tar.xz
b5fd0afe131c82bbce6ddf887c59eef6945910d6a9a2bc87c0927f4e4a096bf9ca4d25bcb729c40f6ebb8a65fbe8bf7b0b97a7c4a8c9e551240eb4f34b878653 Python-3.9.16.tar.xz
9abb510f769fee9c212be728f71802cdd3346b65f052dcc820686feee53a51ad106e4f34e439c5d9dd5da7a00559b07ad0fee4815ebd16fbfb170ba228fc37f5 musl-find_library.patch
c828f33edf1704e3149499d6d34e89264cb5cdb2b09ff05561641b359716d7996f0fe928629e09f006b1fd7850fdaf937275919c7fdd83f5efc32707c64d814b Python-3.9.20.tar.xz
ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2 musl-find_library.patch
a579ca09bdcf08c9d39e75df4294dc310be4ed313431b1e7607f1e44ae22da8840f5658c5a7186bc4d7c89e1c7eec4fdfb81f6a8fb17456abe7b25c5c5bdfdf3 python3.no-static-library.diff
"

75
base/python3/python3.no-static-library.diff Normal file
View file

@ -0,0 +1,75 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Mon, 18 Jan 2010 17:59:07 +0000
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Downstream only: not appropriate for upstream.
See https://bugzilla.redhat.com/show_bug.cgi?id=556092
Co-authored-by: David Malcolm <dmalcolm@redhat.com>
Co-authored-by: Bohuslav Kabrda <bkabrda@redhat.com>
Co-authored-by: Matej Stuchlik <mstuchli@redhat.com>
Co-authored-by: Robert Kuska <rkuska@redhat.com>
Co-authored-by: Charalampos Stratakis <cstratak@redhat.com>
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
---
Makefile.pre.in | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 77f91e72b1..bb4069b18a 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -586,7 +586,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
# Build the interpreter
-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
platform: $(BUILDPYTHON) pybuilddir.txt
@@ -634,12 +634,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-
-# Build static library
-$(LIBRARY): $(LIBRARY_OBJS)
- -rm -f $@
- $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
-
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
@@ -721,7 +715,7 @@ Makefile Modules/config.c: Makefile.pre \
@echo "The Makefile was updated, you may need to re-run make."
-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
############################################################################
@@ -1630,17 +1624,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
else true; \
fi; \
done
- @if test -d $(LIBRARY); then :; else \
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
- if test "$(SHLIB_SUFFIX)" = .dll; then \
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
- else \
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
- fi; \
- else \
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
- fi; \
- fi
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in