0001-Fix-for-OE.patch 2.1 KB

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