mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-05 14:09:53 +03:00
fixup a whole steaming pile of insanity. When packages are configured,
they should be configured with --prefix=/usr and we then need to use make DESTDIR=$(STAGING_DIR) install to get things installed into the staging directory. The current situation for many packages, which use --prefix=$(STAGING_DIR) results in the staging_dir paths getting compiled into the binary itself. This also adds in a pile of libtool fixups. Between broken pkgconfig, broken libtool handling, and broken --prefix settings, its a wonder things have worked as well as they have up till now. -Erik
This commit is contained in:
@@ -34,6 +34,17 @@ $(DMALLOC_DIR)/.configured: $(DMALLOC_DIR)/.unpacked
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
--build=$(GNU_HOST_NAME) \
|
||||
--prefix=/usr \
|
||||
--exec-prefix=/usr \
|
||||
--bindir=/usr/bin \
|
||||
--sbindir=/usr/sbin \
|
||||
--libdir=/lib \
|
||||
--libexecdir=/usr/lib \
|
||||
--sysconfdir=/etc \
|
||||
--datadir=/usr/share \
|
||||
--localstatedir=/var \
|
||||
--includedir=/include \
|
||||
--mandir=/usr/man \
|
||||
--infodir=/usr/info \
|
||||
--enable-threads \
|
||||
--enable-shlib \
|
||||
);
|
||||
@@ -43,12 +54,7 @@ $(DMALLOC_DIR)/$(DMALLOC_BINARY): $(DMALLOC_DIR)/.configured
|
||||
$(MAKE) -C $(DMALLOC_DIR)
|
||||
|
||||
$(TARGET_DIR)/$(DMALLOC_TARGET_BINARY): $(DMALLOC_DIR)/$(DMALLOC_BINARY)
|
||||
$(MAKE) prefix=$(STAGING_DIR)/usr \
|
||||
exec_prefix=$(TARGET_DIR)/usr \
|
||||
libdir=$(STAGING_DIR)/usr/lib \
|
||||
shlibdir=$(TARGET_DIR)/usr/lib \
|
||||
includedir=$(STAGING_DIR)/include \
|
||||
-C $(DMALLOC_DIR) install
|
||||
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DMALLOC_DIR) install
|
||||
(cd $(STAGING_DIR)/usr/lib; \
|
||||
mv libdmalloc*.so $(TARGET_DIR)/usr/lib);
|
||||
touch $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
|
||||
|
||||
Reference in New Issue
Block a user