0001-Fix-for-OE.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. From 55709c14d9ae4becd2d716117604b5d399465b63 Mon Sep 17 00:00:00 2001
  2. From: Kas User <kas@example.com>
  3. Date: Wed, 22 Jun 2022 14:05:03 +0200
  4. Subject: [PATCH] Fix for OE
  5. ---
  6. Makefile | 2 +-
  7. config | 16 ++++++++--------
  8. 2 files changed, 9 insertions(+), 9 deletions(-)
  9. diff --git a/Makefile b/Makefile
  10. index a7312a4..4786d36 100644
  11. --- a/Makefile
  12. +++ b/Makefile
  13. @@ -12,7 +12,7 @@ OBJS= src/$T.o
  14. lib: src/lfs.so
  15. src/lfs.so: $(OBJS)
  16. - MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET); export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) -o src/lfs.so $(OBJS)
  17. + MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET); export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) ${LDFLAGS} -o src/lfs.so $(OBJS)
  18. test: lib
  19. LUA_CPATH=./src/?.so lua tests/test.lua
  20. diff --git a/config b/config
  21. index 33fe514..575d043 100644
  22. --- a/config
  23. +++ b/config
  24. @@ -1,28 +1,28 @@
  25. # Installation directories
  26. # Default installation prefix
  27. -PREFIX=/usr/local
  28. +PREFIX ?= /usr/local
  29. +BASELIB ?= /lib
  30. -LUA_VERSION = 5.1
  31. +LUA_VERSION ?= `pkg-config --modversion lua | cut -d'.' -f1,2`
  32. # System's libraries directory (where binary libraries are installed)
  33. -LUA_LIBDIR= $(PREFIX)/lib/lua/$(LUA_VERSION)
  34. +LUA_LIBDIR= $(PREFIX)$(BASELIB)/lua/$(LUA_VERSION)
  35. # Lua includes directory
  36. LUA_INC += -I$(PREFIX)/include
  37. LUA_INC += -I/usr/include/lua$(LUA_VERSION) -I/usr/include/lua/$(LUA_VERSION)
  38. +LUA_INC = `pkg-config --cflags lua`
  39. # OS dependent
  40. -LIB_OPTION= -shared #for Linux
  41. +LIB_OPTION= -shared ${LDFLAGS} #for Linux
  42. #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
  43. # Minimum runtime OS version on macOS
  44. MACOSX_DEPLOYMENT_TARGET= 10.5
  45. # Compilation directives
  46. -WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
  47. -INCS= $(LUA_INC)
  48. -CFLAGS= $(WARN) $(INCS)
  49. -CC= gcc
  50. +WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
  51. +CFLAGS += $(WARN) $(INCS) ${LUA_INC}
  52. # $Id: config,v 1.21 2007/10/27 22:42:32 carregal Exp $