From 6528ea0dab2f1e49d2af2140ad82ddd0e047379b Mon Sep 17 00:00:00 2001 From: June 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 ref='/src/log/bin/.gitignore?id=15046c274915b1bb06e3c4d7f4bda5a96c8a3005'>unfollow)
Commit message (Expand)Author
2019-10-30Add scheme "screenshot" to causal.agencyJune McEnroe
2019-10-30Add pounce to causal.agencyJune McEnroe
2019-10-28Mark ' for \aJune McEnroe
2019-10-23Add The Book of the Unnamed MidwifeJune McEnroe
2019-10-22Add ConcreteJune McEnroe
2019-10-14Set the write variable for nvim man modeJune McEnroe
2019-10-13Add All Systems RedJune McEnroe
2019-10-10Add The Book of PhoenixJune McEnroe
2019-10-03Add two Kim Petras songsJune McEnroe
2019-10-02Update neovim 0.4.2June McEnroe
2019-10-02Claim to be curl(1) in titleJune McEnroe
2019-10-02Add The Red Threads of FortuneJune McEnroe
2019-09-28Add The Black Tides of HeavenJune McEnroe
2019-09-27Fail on HTTP failure status in titleJune McEnroe
2019-09-23Add Trail of LightningJune McEnroe
2019-09-22Revert "Enable cookies in title"June McEnroe
2019-09-20Enable cookies in titleJune McEnroe
2019-09-16Use sensitivity aliases in TF2June McEnroe
2019-09-16Add The Just CityJune McEnroe
2019-09-12Only GET the final redirect locationJune McEnroe
2019-09-12Consume entire bodyJune McEnroe
2019-09-10Add title -v flagJune McEnroe
2019-09-10Use curl error bufferJune McEnroe
2019-09-10Set Accept-Encoding in titleJune McEnroe
2019-09-08Set title User-AgentJune McEnroe
2019-09-07Add -x flag to titleJune McEnroe
2019-09-07Ignore SIGPIPE in relayJune McEnroe
2019-09-07Add A Memory Called EmpireJune McEnroe
2019-09-05Handle lack of Content-TypeJune McEnroe
2019-09-05Use CURLINFO_CONTENT_TYPEJune McEnroe
2019-09-05Decode entities in titlesJune McEnroe
2019-09-05Print title as soon as it's availableJune McEnroe
2019-09-05Use CURL_PREFIX to set flagsJune McEnroe
2019-09-05Add titleJune McEnroe
2019-09-04Add Avorter n'est pas tuerJune McEnroe
2019-08-29Unset executable on shell scriptsJune McEnroe
2019-08-29Add long-missing setopt to bin.7June McEnroe
2019-08-29Add editJune McEnroe