Skip to content

Commit

Permalink
liblol: make debian packages
Browse files Browse the repository at this point in the history
  • Loading branch information
shankerwangmiao committed Jan 28, 2024
1 parent 1c9c458 commit bfbdd14
Show file tree
Hide file tree
Showing 30 changed files with 564 additions and 376 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/glibc/
/patchelf/
11 changes: 0 additions & 11 deletions autobuild/additional-files/hooks/postinst.in

This file was deleted.

206 changes: 0 additions & 206 deletions autobuild/build

This file was deleted.

8 changes: 0 additions & 8 deletions autobuild/defines

This file was deleted.

2 changes: 0 additions & 2 deletions autobuild/overrides/usr/lib/modules-load.d/liblol.conf

This file was deleted.

1 change: 0 additions & 1 deletion autobuild/patch

This file was deleted.

11 changes: 11 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
liblol (0.1.4~pre2-1) unstable; urgency=medium

* new upstream version

-- Miao Wang <[email protected]> Sun, 28 Jan 2024 08:07:00 +0800

liblol (0.1.3-1) unstable; urgency=medium

* Initial upload

-- Miao Wang <[email protected]> Sat, 27 Jan 2024 18:09:00 +0800
26 changes: 26 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Source: liblol
Section: otherosfs
Priority: optional
Maintainer: Miao Wang <[email protected]>
Build-Depends: debhelper-compat (= 13),
libstdc++6,
quilt,
bison,
gawk,
python3,
Standards-Version: 4.6.2
Homepage: https://github.com/AOSC-Dev/liblol

Package: liblol
Architecture: loong64
Multi-Arch: foreign
Depends: ${misc:Depends},
${shlibs:Depends},
libstdc++6,
libc6 (>= 2.36),
libc6 (<< ${glibcVer}.1~),
Conflicts: glibc,
Recommends: liblol-dkms,
Description: Compatibility layer for old world applications
This package contains a Compatibility layer for old world
applications on new world loongarch64 platform.
2 changes: 2 additions & 0 deletions debian/install
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/lib64/
/usr/lib/loongarch64-debian-linux-gnuow
51 changes: 51 additions & 0 deletions debian/patches/glibc/local-ld-multiarch.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
2012-05-01 Aurelien Jarno <[email protected]>

* elf/Makefile(trusted-dirs.st): Fix DL_DST_LIB computation with
two level slibdir directories.

2009-09-08 Aurelien Jarno <[email protected]>

* Makeconfig: add support for multiarch compat directories.

---
Makeconfig | 9 +++++++++
elf/Makefile | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)

--- a/Makeconfig
+++ b/Makeconfig
@@ -136,6 +136,11 @@
endif
inst_libdir = $(install_root)$(libdir)

+# Compat places to look for libraries
+ifndef extra_libdir
+extra_libdir = /lib:$(exec_prefix)/lib
+endif
+
# Where to install the shared library.
ifndef slibdir
slibdir = $(exec_prefix)/lib
@@ -589,6 +594,10 @@
default-rpath = $(libdir)
endif

+ifdef extra_libdir
+default-rpath += :$(extra_libdir)
+endif
+
ifndef link-extra-libs
link-extra-libs = $(LDLIBS-$(@F))
link-extra-libs-static = $(link-extra-libs)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -507,7 +507,7 @@
$(make-target-directory)
echo "$(subst :, ,$(user-defined-trusted-dirs-pre) $(default-rpath) $(user-defined-trusted-dirs))" \
| $(AWK) -f gen-trusted-dirs.awk > ${@:st=T};
- echo '#define DL_DST_LIB "$(notdir $(slibdir))"' >> ${@:st=T}
+ echo '#define DL_DST_LIB "$(shell echo $(slibdir) | sed 's,/,,')"' >> ${@:st=T}
echo '#define SYSTEM_DIRS_PRE_COUNT $(words $(subst :, ,$(user-defined-trusted-dirs-pre)))' >> ${@:st=T}
$(move-if-change) ${@:st=T} ${@:st=h}
touch $@
CPPFLAGS-dl-load.c += -I$(objpfx). -I$(csu-objpfx).
Loading

0 comments on commit bfbdd14

Please sign in to comment.