Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python313 hi3535 arch freetype fix #6420

Merged
merged 3 commits into from
Jan 25, 2025
Merged

python313 hi3535 arch freetype fix #6420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a59f480
bzip2: Fix pkgconfig file creation
th0ma7 Jan 25, 2025
70c83e4
python.mk: Do not create symlinks for bzip2 against python dir
th0ma7 Jan 25, 2025
69827de
freetype: Add cross/bzip2 as extra default dependency
th0ma7 Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cross/bzip2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ bzip2_post_install:
ln -sf libbz2.so.$(PKG_VERS) $(STAGING_INSTALL_PREFIX)/lib/libbz2.so.1.0
@install -m 755 -d $(STAGING_INSTALL_PREFIX)/lib/pkgconfig
@install -m 644 src/bzip2.pc $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/
@sed -ie 's%@PREFIX@%$(STAGING_INSTALL_PREFIX)%g' $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/bzip2.pc
@sed -ie 's%@VERSION@%$(PKG_VERS)%g' $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/bzip2.pc
@sed -i 's%@PREFIX@%$(STAGING_INSTALL_PREFIX)%g' $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/bzip2.pc
@sed -i 's%@VERSION@%$(PKG_VERS)%g' $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/bzip2.pc
2 changes: 1 addition & 1 deletion cross/freetype/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://download.savannah.gnu.org/releases/freetype
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/zlib cross/libpng
DEPENDS = cross/bzip2 cross/libpng cross/zlib

HOMEPAGE = https://www.freetype.org
COMMENT = FreeType is a freely available software library to render fonts.
Expand Down
8 changes: 4 additions & 4 deletions mk/spksrc.python.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ export ADDITIONAL_LDFLAGS += -L$(OPENSSL_STAGING_PREFIX)/lib
export ADDITIONAL_LDFLAGS += -Wl,--rpath-link,$(OPENSSL_STAGING_PREFIX)/lib -Wl,--rpath,$(OPENSSL_PREFIX)/lib
endif

# Re-use all default python mandatory libraries (with exception of xz, zlib)
PYTHON_LIBS_EXCLUDE = %lzma.pc %zlib.pc
# Re-use all default python mandatory libraries (with exception of bzip2, xz, zlib)
PYTHON_LIBS_EXCLUDE = %bzip2.pc %lzma.pc %zlib.pc
PYTHON_LIBS := $(filter-out $(PYTHON_LIBS_EXCLUDE),$(wildcard $(PYTHON_STAGING_INSTALL_PREFIX)/lib/pkgconfig/*.pc))

# Re-use all python dependencies and mark as already done (with exceltion of xz, zlib)
PYTHON_DEPENDS_EXCLUDE = xz zlib
# Re-use all python dependencies and mark as already done (with exceltion of bzip2, xz, zlib)
PYTHON_DEPENDS_EXCLUDE = bzip2 xz zlib
PYTHON_DEPENDS := $(foreach cross,$(filter-out $(PYTHON_DEPENDS_EXCLUDE),$(foreach pkg_name,$(shell $(MAKE) dependency-list -C $(realpath $(PYTHON_PACKAGE_WORK_DIR)/../) 2>/dev/null | grep ^$(PYTHON_PACKAGE) | cut -f2 -d:),$(shell sed -n 's/^PKG_NAME = \(.*\)/\1/p' $(realpath $(CURDIR)/../../$(pkg_name)/Makefile)))),$(wildcard $(PYTHON_PACKAGE_WORK_DIR)/.$(cross)-*_done))

# call-up pre-depend to prepare the shared python build environment
Expand Down
Loading