Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added libutempter #3583

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions cross/libutempter/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
PKG_NAME = libutempter
PKG_VERS = 1.1.6
PKG_EXT = tar.bz2
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = ftp://ftp.altlinux.org/pub/people/ldv/utempter/
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

CONFIGURE_TARGET = nop
DEPENDS =

POST_PATCH_TARGET = libutempter_post_patch

HOMEPAGE = http://freshmeat.sourceforge.net/projects/libutempter
COMMENT = libutempter provides a library interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files.
LICENSE = LGPLv2

include ../../mk/spksrc.cross-cc.mk

.PHONY: libutempter_post_patch
libutempter_post_patch:
$(RUN) sed -e 's#@INSTALL_PREFIX@#$(STAGING_INSTALL_PREFIX)#' -i Makefile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am interested in a more "elegant" way to apply STAGING_INSTALL_PREFIX at "install" step... maybe overriding "DESTDIR" as make install command option may do the trick

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m really not familiar at all with spksrc, with matts help I’ve managed to get this far with libutempter but that’s the extent of my knowledge, I don’t know where to start with doing this another way!

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need a bit of a “you need to do these changes” help for this, I’m new to spksrc and generally Makefiles (30 years of commercial development and I’ve avoided Makefiles!).


3 changes: 3 additions & 0 deletions cross/libutempter/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
lnk:lib/libutempter.so
lnk:lib/libutempter.so.0
lib:lib/libutempter.so.1.1.6
3 changes: 3 additions & 0 deletions cross/libutempter/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
libutempter-1.1.6.tar.bz2 SHA1 1964279755290c4b576f2db0ed518e2b45a9ca53
libutempter-1.1.6.tar.bz2 SHA256 b898565f31ced7e5c1fa0a2eaa0f6ff0ed862b5fe375d26375b64bfbdfeac397
libutempter-1.1.6.tar.bz2 MD5 b43827806923903aba2bc7cd3a2d45b7
19 changes: 19 additions & 0 deletions cross/libutempter/patches/Makefile.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- Makefile 2010-11-04 17:14:53.000000000 +0000
+++ Makefile.new 2019-01-18 09:48:35.000000000 +0000
@@ -30,10 +30,12 @@
TARGETS = $(PROJECT) $(SHAREDLIB) $(STATICLIB)

INSTALL = install
-libdir = /usr/lib
-libexecdir = /usr/lib
-includedir = /usr/include
-mandir = /usr/share/man
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mandir has been discarded, so man3dir will be mangled. OK it does not matter in our case, but I like when things are clean.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’ll take a look tomorrow at this, I might have just got over zeleous

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’ll fix this.

+prefix = @INSTALL_PREFIX@
+exec_prefix =${prefix}
+libdir =${exec_prefix}/lib
+libexecdir =${exec_prefix}/lib
+sharedlibdir =${libdir}
+includedir =${prefix}/include
man3dir = $(mandir)/man3
DESTDIR =

2 changes: 1 addition & 1 deletion cross/mosh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/mobile-shell/mosh/releases/download/$(PKG_DIR)

DEPENDS = cross/zlib cross/openssl cross/protobuf cross/ncurses
DEPENDS = cross/zlib cross/openssl cross/protobuf cross/ncurses cross/libutempter

HOMEPAGE = https://mosh.org
COMMENT = Mosh: the mobile shell
Expand Down