3 Commits

Author SHA1 Message Date
Zion Nimchuk bf6971f951 Makefile correctly outputs the correct AppRun binary name, improved gitignore filters 2020-02-12 01:21:50 -08:00
Zion Nimchuk 6645ad73ba Allow both GLIBCXX and CXXABI error checks, Fix dead link 2020-02-12 01:12:35 -08:00
Zion Nimchuk d5f8c58661 CXXABI, not GLIBCXX 2018-12-05 13:59:24 -08:00
3 changed files with 9 additions and 7 deletions
+2
View File
@@ -1,3 +1,5 @@
/AppRun.c
/AppRun_patched*
/AppRun-patched*
*.so
*.o
+1 -1
View File
@@ -21,7 +21,7 @@
+ {
+ char errorStr[1035];
+ fgets(errorStr, sizeof(errorStr), fp);
+ const char* searchStr = "*libstdc++*version `GLIBCXX_*' not found (required by";
+ const char* searchStr = "*libstdc++*version `*' not found (required by";
+ int searchStrI = 0;
+ int errorStrI = 0;
+ int lastWildcard = 0;
+6 -6
View File
@@ -1,6 +1,6 @@
CFLAGS ?= -O2 -Wall -Wextra
LDFLAGS += -s
BIN = AppRun_patched
BIN = AppRun-patched-x86_64
LIB = exec-x86_64.so
EXEC_TEST = exec_test
ENV_TEST = env_test
@@ -12,14 +12,14 @@ test: $(EXEC_TEST) $(ENV_TEST)
all: checkrt test
clean:
-rm -f $(BIN) $(LIB) $(EXEC_TEST) $(ENV_TEST) *.o AppRun.c AppRun_patched.c
-rm -f $(BIN) $(LIB) $(EXEC_TEST) $(ENV_TEST) *.o AppRun.c AppRun-patched-x86_64.c
$(BIN): AppRun_patched.o checkrt.o env.o
$(BIN): AppRun-patched-x86_64.o checkrt.o env.o
$(LIB): exec.o env.o
$(CC) -shared $(LDFLAGS) -o $@ $^ -ldl
AppRun_patched.o checkrt.o: CFLAGS += -include checkrt.h
AppRun-patched-x86_64.o checkrt.o: CFLAGS += -include checkrt.h
exec.o env.o: CFLAGS += -fPIC
$(EXEC_TEST): CFLAGS += -DEXEC_TEST
@@ -34,10 +34,10 @@ run_tests: $(EXEC_TEST) $(ENV_TEST)
./$(ENV_TEST)
./$(EXEC_TEST)
AppRun_patched.c: AppRun.c
AppRun-patched-x86_64.c: AppRun.c
patch -p1 --output $@ < AppRun.c.patch
AppRun.c:
wget -c "https://raw.githubusercontent.com/AppImage/AppImageKit/appimagetool/master/src/AppRun.c"
wget -c "https://raw.githubusercontent.com/AppImage/AppImageKit/master/src/AppRun.c"
.PHONY: checkrt test run_tests all clean