чување c4c6e6c67cb366c62c9dbf9cd1d223ba8d8fbca9
родитељ 8818033744fd9f13a201ce6be8ae69c40f659b70
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Thu, 25 Aug 2022 19:29:35 +0200
Add notmuch; update xapian-core to use -fPIC
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 5, додавања: 67(+), брисања: 13(-)
diff --git a/TODO b/TODO
@@ -1,18 +1,11 @@
TODO
====
-[x] Investigate why is install sometimes incorrectly defined as ../install in
- Makefiles
- - Auto*hell crap; can be overridden by `make INSTALL=install install`
- - Precise cause is INSTALL=install; autoconf slaps path relative to base src
- dir in front of install cmd for some reason. When set to, for example,
- INSTALL=/bin/install, it works.
-
[~] Add neomutt
[~] Determine minimal set of dependencies to run Luke Smith's
mutt-wizard and add those first
[x] xapian-core
- [~] notmuch (rabbit hole...)
+ [x] notmuch (rabbit hole...)
[x] gmime
[x] glib
[x] xmlto
@@ -27,6 +20,13 @@ TODO
Done
----
+[x] Investigate why is install sometimes incorrectly defined as ../install in
+ Makefiles
+ - Auto*hell crap; can be overridden by `make INSTALL=install install`
+ - Precise cause is INSTALL=install; autoconf slaps path relative to base src
+ dir in front of install cmd for some reason. When set to, for example,
+ INSTALL=/bin/install, it works.
+
[/] Create separate .mk for Auto*hell packages (standard.mk is not applicable)
- It would complicate things instead of simplifying. Better to create custom
rules.
diff --git a/notmuch/config.mk b/notmuch/config.mk
@@ -0,0 +1,5 @@
+PKGBASE= notmuch
+PKGVER= 0.36
+LEGALFILES= COPYING COPYING-GPL-3
+PREFIX= /sucks
+SRCTARBALLS= https://notmuchmail.org/releases/$PKGNAME-$PKGVER.tar.xz
diff --git a/notmuch/mkfile b/notmuch/mkfile
@@ -0,0 +1,47 @@
+mkpklib=/lib/mkpk
+<$mkpklib/defaults.mk
+<config.mk
+<$mkpklib/derivatives.mk
+
+PKG= $PKGBASE-$PKGVER
+BINDIR= /bin
+MANDIR= /share/man
+SYSCONFDIR= /etc
+LOCALSTATEDIR= /var
+CFLAGS= -Os -pipe -fPIC
+LDFLAGS= -s
+
+$PKGBASE:QV:
+ printf " CONF\t%s\n" --prefix=$PREFIX
+ CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS \
+ ./configure --prefix=$PREFIX \
+ --bindir=$BINDIR \
+ --mandir=$MANDIR \
+ --sysconfdir=$SYSCONFDIR \
+ --localstatedir=$LOCALSTATEDIR \
+ --without-bash-completion \
+ --without-emacs \
+ --without-desktop \
+ --without-ruby \
+ --without-zsh-completion
+ printf " MAKE\n"
+ make
+
+install:QV: $PKGBASE install-legal
+ printf " MAKE\t%s\n" "DESTDIR=$(realpath $DESTDIR) install"
+ make DESTDIR=$(realpath $DESTDIR) install
+
+install-legal:QV: $PKGBASE
+ for legalfile in $LEGALFILES; do
+ printf " INST\t%s\n" "$legalfile"
+ $INSTALL -Dm0644 "$legalfile" $LEGALDIR/$legalfile
+ done
+
+clean:QV:
+ #if [ -e Makefile ]; then
+ # printf " MAKE\tclean\n"
+ # make clean
+ #fi
+ :
+
+<$mkpklib/package.mk
diff --git a/xapian-core/config.mk b/xapian-core/config.mk
@@ -1,4 +1,5 @@
+PKGBASE= xapian-core
PKGVER= 1.4.20
LEGALFILES= COPYING
PREFIX= /
-SRCTARBALLS= https://oligarchy.co.uk/xapian/1.4.20/xapian-core-1.4.20.tar.xz
+SRCTARBALLS= https://oligarchy.co.uk/xapian/$PKGVER/$PKGBASE-$PKGVER.tar.xz
diff --git a/xapian-core/mkfile b/xapian-core/mkfile
@@ -3,12 +3,11 @@ mkpklib=/lib/mkpk
<config.mk
<$mkpklib/derivatives.mk
-PKGBASE= xapian-core
PKG= $PKGBASE-$PKGVER
BINDIR= /bin
MANDIR= /share/man
SYSCONFDIR= /etc
-CFLAGS= $CFLAGS -static-libstdc++ -static-libgcc
+CFLAGS= $CFLAGS -static-libstdc++ -static-libgcc -fPIC
CXXFLAGS= $CFLAGS
LDFLAGS= -static -Wl,-Bstatic
@@ -43,7 +42,9 @@ install-legal:QV: $PKGBASE
done
clean:QV:
- printf " MAKE\tclean\n"
- make clean
+ if [ -e Makefile ]; then
+ printf " MAKE\tclean\n"
+ make clean
+ fi
<$mkpklib/package.mk
