Skip to content

Commit

Permalink
remove native/glib again
Browse files Browse the repository at this point in the history
- native/glib is not required, since glib-mkenums is a python script and must not be built for the build system
- adapted from #5298
  • Loading branch information
hgy59 committed Jun 8, 2022
1 parent c77372e commit 7766032
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 26 deletions.
6 changes: 3 additions & 3 deletions cross/avahi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/lathiat/avahi/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

BUILD_DEPENDS = native/glib
DEPENDS = cross/glib cross/libevent cross/libexpat cross/libdaemon cross/dbus

HOMEPAGE = https://www.avahi.org/
Expand All @@ -14,13 +13,14 @@ LICENSE = LGPLv2.1

GNU_CONFIGURE = 1
CONFIGURE_ARGS = --with-distro=none
CONFIGURE_ARGS += --disable-static
CONFIGURE_ARGS += --disable-qt5 --disable-qt4
CONFIGURE_ARGS += --disable-gtk --disable-gtk3
CONFIGURE_ARGS += --disable-gdbm
CONFIGURE_ARGS += --disable-python
CONFIGURE_ARGS += --disable-mono --disable-monodoc

NATIVE_GLIB_GOBJECT_DIR = $(realpath $(WORK_DIR)/../../../native/glib/work-native/install/usr/local/bin)
ENV = PATH=$$PATH:$(NATIVE_GLIB_GOBJECT_DIR)
# Build requires access to glib-mkenums Python script from cross/glib
ENV += PATH=$$PATH:$(STAGING_INSTALL_PREFIX)/bin

include ../../mk/spksrc.cross-cc.mk
5 changes: 2 additions & 3 deletions cross/harfbuzz/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ PKG_DIST_SITE = https://github.com/harfbuzz/harfbuzz/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

BUILD_DEPENDS = native/glib
DEPENDS = cross/glib cross/freetype cross/cairo cross/fontconfig cross/libicu

HOMEPAGE = https://harfbuzz.github.io/
Expand All @@ -16,8 +15,8 @@ LICENSE = Old MIT
# Toolchains lacking c++11 compiler ar not supported
UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)

NATIVE_GLIB_GOBJECT_DIR = $(realpath $(WORK_DIR)/../../../native/glib/work-native/install/usr/local/bin)
ENV = PATH=$$PATH:$(NATIVE_GLIB_GOBJECT_DIR)
# Build requires access to glib-mkenums Python script from cross/glib
ENV += PATH=$$PATH:$(STAGING_INSTALL_PREFIX)/bin

CONFIGURE_ARGS += -Dtests=disabled -Ddocs=disabled -Dintrospection=disabled

Expand Down
17 changes: 0 additions & 17 deletions native/glib/Makefile

This file was deleted.

3 changes: 0 additions & 3 deletions native/glib/digests

This file was deleted.

0 comments on commit 7766032

Please sign in to comment.