From af4ca61222bdc9a426f491ffd7c9ef010263abae Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Mon, 21 Dec 2020 16:33:08 -0500 Subject: Move wcfix to port/wcwidth --- home/.local/bin/wcfix | 7 ------- port/wcwidth/.gitignore | 3 ++- port/wcwidth/Makefile | 24 ++++++++++++++++-------- port/wcwidth/wcfix.in | 7 +++++++ 4 files changed, 25 insertions(+), 16 deletions(-) delete mode 100755 home/.local/bin/wcfix create mode 100644 port/wcwidth/wcfix.in diff --git a/home/.local/bin/wcfix b/home/.local/bin/wcfix deleted file mode 100755 index b31bd19b..00000000 --- a/home/.local/bin/wcfix +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -eu - -export DYLD_FORCE_FLAT_NAMESPACE=1 -export DYLD_INSERT_LIBRARIES=~/.local/lib/libwcwidth.dylib - -exec "$@" diff --git a/port/wcwidth/.gitignore b/port/wcwidth/.gitignore index aa25f78d..132e8098 100644 --- a/port/wcwidth/.gitignore +++ b/port/wcwidth/.gitignore @@ -1,2 +1,3 @@ *.o -*.dylib +libwcwidth.dylib +wcfix diff --git a/port/wcwidth/Makefile b/port/wcwidth/Makefile index f6932d6d..50faa653 100644 --- a/port/wcwidth/Makefile +++ b/port/wcwidth/Makefile @@ -1,19 +1,27 @@ -PREFIX = ~/.local +PREFIX ?= ~/.local OBJS = wcwidth.o wcswidth.o -DYLIB = libwcwidth.dylib -${DYLIB}: ${OBJS} +all: libwcwidth.dylib wcfix + +libwcwidth.dylib: ${OBJS} ${CC} -dynamiclib ${LDFLAGS} ${OBJS} -o $@ wcwidth.o: nonspacing.h wide.h +.SUFFIXES: .in + +.in: + sed 's|%%PREFIX%%|${PREFIX}|g' $< > $@ + chmod a+x $@ + clean: - rm -f ${DYLIB} ${OBJS} + rm -f libwcwidth.dylib wcfix ${OBJS} -install: ${DYLIB} - install -d ${PREFIX}/lib - install -m 644 ${DYLIB} ${PREFIX}/lib +install: libwcwidth.dylib wcfix + install -d ${PREFIX}/lib ${PREFIX}/bin + install -m 644 libwcwidth.dylib ${PREFIX}/lib + install wcfix ${PREFIX}/bin uninstall: - rm -f ${PREFIX}/lib/${DYLIB} + rm -f ${PREFIX}/lib/libwcwidth.dylib ${PREFIX}/bin/wcfix diff --git a/port/wcwidth/wcfix.in b/port/wcwidth/wcfix.in new file mode 100644 index 00000000..832c83d6 --- /dev/null +++ b/port/wcwidth/wcfix.in @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu + +export DYLD_FORCE_FLAT_NAMESPACE=1 +export DYLD_INSERT_LIBRARIES=%%PREFIX%%/lib/libwcwidth.dylib + +exec "$@" -- cgit 1.4.1