libports: migrate to new ports mechanism

Issue #1082
This commit is contained in:
Norman Feske 2014-05-07 23:52:52 +02:00
parent bcbb0dabf5
commit 85a2ebc1c4
333 changed files with 1535 additions and 3923 deletions

114
.gitignore vendored
View File

@ -23,123 +23,9 @@
/repos/dde_rump/include/rump /repos/dde_rump/include/rump
/repos/libports/contrib /repos/libports/contrib
/repos/libports/download /repos/libports/download
/repos/libports/include/curl/
/repos/libports/include/EGL/egl.h
/repos/libports/include/EGL/eglext.h
/repos/libports/include/GL
/repos/libports/include/KHR
/repos/libports/include/SDL
/repos/libports/include/exfat
/repos/libports/include/ffat
/repos/libports/include/fribidi
/repos/libports/include/freetype
/repos/libports/include/ft2build.h
/repos/libports/include/fuse-ext2
/repos/libports/include/iconv/
/repos/libports/include/icu/
/repos/libports/include/jbig2dec
/repos/libports/include/libc-amd64/
/repos/libports/include/libc-arm/
/repos/libports/include/libc-i386/
/repos/libports/include/libc/
/repos/libports/include/libpng
/repos/libports/include/libssh/
/repos/libports/include/lua
/repos/libports/include/lwip/lwip
/repos/libports/include/lwip/netif
/repos/libports/include/mupdf
/repos/libports/include/ncurses/MKterm.h.awk
/repos/libports/include/ncurses/capdefaults.c
/repos/libports/include/ncurses/curses.h
/repos/libports/include/ncurses/ncurses.h
/repos/libports/include/ncurses/hashed_db.h
/repos/libports/include/ncurses/hashsize.h
/repos/libports/include/ncurses/init_keytry.h
/repos/libports/include/ncurses/keys.list
/repos/libports/include/ncurses/nc_alloc.h
/repos/libports/include/ncurses/nc_panel.h
/repos/libports/include/ncurses/nc_tparm.h
/repos/libports/include/ncurses/ncurses_def.h
/repos/libports/include/ncurses/ncurses_dll.h
/repos/libports/include/ncurses/parametrized.h
/repos/libports/include/ncurses/term.h
/repos/libports/include/ncurses/term_entry.h
/repos/libports/include/ncurses/termcap.h
/repos/libports/include/ncurses/tic.h
/repos/libports/include/ncurses/unctrl.h
/repos/libports/include/openjpeg
/repos/libports/include/openssl
/repos/libports/src/lib/openssl/x86_32/aes_enc.s
/repos/libports/src/lib/openssl/x86_32/cpuid.s
/repos/libports/src/lib/openssl/x86_64/aes_enc.s
/repos/libports/src/lib/openssl/x86_64/cpuid.s
/repos/libports/src/lib/openssl/x86_64/modexp512.s
/repos/libports/src/lib/openssl/x86_64/rc4_md5.s
/repos/libports/include/pcre
/repos/libports/include/python2.6
/repos/libports/include/qoost
/repos/libports/include/readline/keymaps.h
/repos/libports/include/readline/rlstdc.h
/repos/libports/include/readline/rltypedefs.h
/repos/libports/include/readline/tilde.h
/repos/libports/include/stdcxx
/repos/libports/include/zlib
/repos/libports/include/gmp/gmp-impl.h
/repos/libports/include/gmp/arm/gmp-mparam.h
/repos/libports/include/gmp/x86_32/gmp-mparam.h
/repos/libports/include/gmp/x86_64/gmp-mparam.h
/repos/libports/include/mpc/
/repos/libports/include/mpfr/
/repos/libports/include/stdcxx-genode/bits/atomic_lockfree_defines.h
/repos/libports/include/stdcxx-genode/bits/atomic_word.h
/repos/libports/include/stdcxx-genode/bits/basic_file.h
/repos/libports/include/stdcxx-genode/bits/c++allocator.h
/repos/libports/include/stdcxx-genode/bits/c++io.h
/repos/libports/include/stdcxx-genode/bits/c++locale.h
/repos/libports/include/stdcxx-genode/bits/cpu_defines.h
/repos/libports/include/stdcxx-genode/bits/cxxabi_tweaks.h
/repos/libports/include/stdcxx-genode/bits/ctype_base.h
/repos/libports/include/stdcxx-genode/bits/ctype_inline.h
/repos/libports/include/stdcxx-genode/bits/cxxabi_forced.h
/repos/libports/include/stdcxx-genode/bits/error_constants.h
/repos/libports/include/stdcxx-genode/bits/exception_defines.h
/repos/libports/include/stdcxx-genode/bits/hash_bytes.h
/repos/libports/include/stdcxx-genode/bits/messages_members.h
/repos/libports/include/stdcxx-genode/bits/os_defines.h
/repos/libports/include/stdcxx-genode/bits/time_members.h
/repos/libports/include/stdcxx-genode/bits/exception_ptr.h
/repos/libports/include/stdcxx-genode/bits/nested_exception.h
/repos/libports/include/stdcxx-genode/exception
/repos/libports/include/stdcxx-genode/new
/repos/libports/include/stdcxx-genode/typeinfo
/repos/libports/include/stdcxx-genode/initializer_list
/repos/libports/include/x86emu/stdint.h
/repos/libports/include/x86emu/stdio.h
/repos/libports/include/x86emu/stdlib.h
/repos/libports/include/x86emu/string.h
/repos/libports/include/x86emu/x86emu.h
/repos/libports/include/x86emu/x86emu/
/repos/libports/src/lib/gmp/mpn/asm-defs.m4
/repos/libports/src/lib/gmp/mpn/arm/hamdist.c
/repos/libports/src/lib/gmp/mpn/arm/popcount.c
/repos/libports/src/lib/gmp/mpn/x86_32/add_n.asm
/repos/libports/src/lib/gmp/mpn/x86_32/sub_n.asm
/repos/libports/src/lib/gmp/mpn/x86_64/add_n.asm
/repos/libports/src/lib/gmp/mpn/x86_64/hamdist.asm
/repos/libports/src/lib/gmp/mpn/x86_64/popcount.asm
/repos/libports/src/lib/gmp/mpn/x86_64/sub_n.asm
/repos/libports/src/lib/ncurses/codes.c
/repos/libports/src/lib/ncurses/comp_captab.c
/repos/libports/src/lib/ncurses/fallback.c
/repos/libports/src/lib/ncurses/make_hash
/repos/libports/src/lib/ncurses/make_keys
/repos/libports/src/lib/ncurses/names.c
/repos/libports/src/lib/ncurses/unctrl.c
/repos/libports/src/lib/qt5/qtjsbackend /repos/libports/src/lib/qt5/qtjsbackend
/repos/libports/src/lib/qt5/qtwebkit/Source/JavaScriptCore /repos/libports/src/lib/qt5/qtwebkit/Source/JavaScriptCore
/repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/generated /repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/generated
/repos/libports/tool/mesa/glsl
/repos/libports/tool/mupdf
/repos/libports/tool/qt5/bootstrap /repos/libports/tool/qt5/bootstrap
/repos/libports/tool/qt5/misc/var /repos/libports/tool/qt5/misc/var
/repos/libports/tool/qt5/moc /repos/libports/tool/qt5/moc

View File

@ -0,0 +1 @@
#include <curses.h>

View File

@ -0,0 +1 @@
#include <config/basic_file_stdio.h>

View File

@ -0,0 +1 @@
#include <config/new_allocator_base.h>

View File

@ -0,0 +1 @@
#include <config/c_io_stdio.h>

View File

@ -0,0 +1 @@
#include <config/c_locale.h>

View File

@ -0,0 +1 @@
#include <sys/types.h>

View File

@ -0,0 +1 @@
#include <sys/types.h>

View File

@ -0,0 +1 @@
#include <sys/types.h>

View File

@ -0,0 +1 @@
#include <sys/types.h>

View File

@ -1,2 +1 @@
LIBAV := libav-0.8.2 INC_DIR += $(call select_from_ports,libav)/include/libav
REP_INC_DIR += contrib/$(LIBAV)

View File

@ -1,3 +1,3 @@
include $(call select_from_repositories,lib/import/import-av.inc) include $(call select_from_repositories,lib/import/import-av.inc)
REP_INC_DIR += contrib/$(LIBAV)/libavcodec INC_DIR += $(call select_from_ports,libav)/include/libav/libavcodec

View File

@ -1,4 +1,4 @@
include $(call select_from_repositories,lib/import/import-av.inc) include $(call select_from_repositories,lib/import/import-av.inc)
REP_INC_DIR += contrib/$(LIBAV)/libavutil \ REP_INC_DIR += include/libavutil
include/libavutil INC_DIR += $(call select_from_ports,libav)/include/libav/libavutil

View File

@ -1,4 +1,4 @@
REP_INC_DIR += include/curl INC_DIR += $(call select_from_ports,curl)/include
ifeq ($(filter-out $(SPECS),x86_32),) ifeq ($(filter-out $(SPECS),x86_32),)
TARGET_CPUARCH=x86_32 TARGET_CPUARCH=x86_32

View File

@ -1,4 +1 @@
EXPAT_VER = 2.1.0 INC_DIR += $(call select_from_ports,expat)/include
EXPAT = expat-$(EXPAT_VER)
REP_INC_DIR += contrib/$(EXPAT)/lib

View File

@ -0,0 +1 @@
INC_DIR += $(call select_from_ports,ffat)/include

View File

@ -0,0 +1 @@
INC_DIR += $(call select_from_ports,freetype)/include

View File

@ -0,0 +1 @@
INC_DIR += $(call select_from_ports,mesa)/include

View File

@ -1,16 +1,20 @@
GMP_PORT_DIR := $(call select_from_ports,gmp)
REP_INC_DIR += include/gmp REP_INC_DIR += include/gmp
INC_DIR += $(GMP_PORT_DIR)/include
ifeq ($(filter-out $(SPECS),arm),) ifeq ($(filter-out $(SPECS),arm),)
REP_INC_DIR += include/gmp/32bit REP_INC_DIR += include/gmp/32bit
REP_INC_DIR += include/gmp/arm INC_DIR += $(GMP_PORT_DIR)/include/arm
endif endif
ifeq ($(filter-out $(SPECS),x86_32),) ifeq ($(filter-out $(SPECS),x86_32),)
REP_INC_DIR += include/gmp/32bit REP_INC_DIR += include/gmp/32bit
REP_INC_DIR += include/gmp/x86_32 INC_DIR += $(GMP_PORT_DIR)/include/x86_32
endif endif
ifeq ($(filter-out $(SPECS),x86_64),) ifeq ($(filter-out $(SPECS),x86_64),)
REP_INC_DIR += include/gmp/64bit REP_INC_DIR += include/gmp/64bit
REP_INC_DIR += include/gmp/x86_64 INC_DIR += $(GMP_PORT_DIR)/include/x86_64
endif endif

View File

@ -0,0 +1 @@
include $(call select_from_repositories,lib/import/import-readline.mk)

View File

@ -1,2 +1,4 @@
REP_INC_DIR += include/icu/common ICU_PORT_DIR := $(call select_from_ports,icu)
REP_INC_DIR += include/icu/i18n
INC_DIR += $(ICU_PORT_DIR)/include/icu/common
INC_DIR += $(ICU_PORT_DIR)/include/icu/i18n

View File

@ -1 +1 @@
REP_INC_DIR += include/jbig2dec INC_DIR += $(call select_from_ports,jbig2dec)/include/jbig2dec

View File

@ -1,3 +1,2 @@
JPEG = jpeg-7 INC_DIR += $(call select_from_ports,jpeg)/include/jpeg
REP_INC_DIR += contrib/$(JPEG) \ REP_INC_DIR += include/jpeg
include/jpeg

View File

@ -1,7 +1,9 @@
LIBC_PORT_DIR := $(call select_from_ports,libc)
# #
# Add generic libc headers to standard include search paths # Add generic libc headers to standard include search paths
# #
REP_INC_DIR += include/libc INC_DIR += $(LIBC_PORT_DIR)/include/libc
# #
# Genode-specific supplements to standard libc headers # Genode-specific supplements to standard libc headers
@ -13,17 +15,16 @@ REP_INC_DIR += include/libc-genode
# #
ifeq ($(filter-out $(SPECS),x86),) ifeq ($(filter-out $(SPECS),x86),)
ifeq ($(filter-out $(SPECS),32bit),) ifeq ($(filter-out $(SPECS),32bit),)
LIBC_REP_INC_DIR = include/libc-i386 LIBC_ARCH_INC_DIR := $(LIBC_PORT_DIR)/include/libc-i386
endif # 32bit endif # 32bit
ifeq ($(filter-out $(SPECS),64bit),) ifeq ($(filter-out $(SPECS),64bit),)
LIBC_REP_INC_DIR = include/libc-amd64 LIBC_ARCH_INC_DIR := $(LIBC_PORT_DIR)/include/libc-amd64
endif # 32bit endif # 32bit
LIBC_REP_INC_DIR += include/libc-x86
endif # x86 endif # x86
ifeq ($(filter-out $(SPECS),arm),) ifeq ($(filter-out $(SPECS),arm),)
LIBC_REP_INC_DIR = include/libc-arm LIBC_ARCH_INC_DIR := $(LIBC_PORT_DIR)/include/libc-arm
endif # ARM endif # ARM
# #
@ -31,11 +32,11 @@ endif # ARM
# we have to prevent the build system from building the target. This is # we have to prevent the build system from building the target. This is
# done by adding an artificial requirement. # done by adding an artificial requirement.
# #
ifeq ($(LIBC_REP_INC_DIR),) ifeq ($(LIBC_ARCH_INC_DIR),)
REQUIRES += libc_support_for_your_target_platform REQUIRES += libc_support_for_your_target_platform
endif endif
REP_INC_DIR += $(LIBC_REP_INC_DIR) INC_DIR += $(LIBC_ARCH_INC_DIR)
# #
# Prevent gcc headers from defining __size_t. This definition is done in # Prevent gcc headers from defining __size_t. This definition is done in

View File

@ -1,4 +1,4 @@
REP_INC_DIR += include/openssl INC_DIR += $(call select_from_ports,openssl)/include
ifeq ($(filter-out $(SPECS),x86_32),) ifeq ($(filter-out $(SPECS),x86_32),)
TARGET_CPUARCH=x86_32 TARGET_CPUARCH=x86_32

View File

@ -1 +1 @@
REP_INC_DIR += include/exfat INC_DIR += $(call select_from_ports,exfat)/include

View File

@ -1 +1 @@
REP_INC_DIR += include/fuse-ext2 INC_DIR += $(call select_from_ports,fuse-ext2)/include/fuse-ext2

View File

@ -1 +1 @@
REP_INC_DIR += include/iconv INC_DIR += $(call select_from_ports,libiconv)/include/iconv

View File

@ -1 +1 @@
REP_INC_DIR += include/ntfs-3g INC_DIR += $(call select_from_ports,ntfs-3g)/include/ntfs-3g

View File

@ -1 +1,2 @@
REP_INC_DIR += include/libpng INC_DIR += $(call select_from_repositories,include/libpng)
INC_DIR += $(call select_from_ports,libpng)/include/libpng

View File

@ -1 +1,2 @@
REP_INC_DIR += include/libssh REP_INC_DIR += include/libssh
INC_DIR += $(call select_from_ports,libssh)/include

View File

@ -1,10 +1 @@
REP_INC_DIR += include/openssl include $(call select_from_repositories,lib/import/import-libcrypto.mk)
ifeq ($(filter-out $(SPECS),x86_32),)
TARGET_CPUARCH=x86_32
else ifeq ($(filter-out $(SPECS),x86_64),)
TARGET_CPUARCH=x86_64
endif
# include architecture specific opensslconf.h
REP_INC_DIR += src/lib/openssl/$(TARGET_CPUARCH)

View File

@ -1 +1 @@
REP_INC_DIR += include/lua INC_DIR += $(call select_from_ports,lua)/include/lua

View File

@ -1 +1 @@
REP_INC_DIR += include/lua INC_DIR += $(call select_from_ports,lua)/include/lua

View File

@ -1 +1,2 @@
REP_INC_DIR += include/lwip INC_DIR += $(call select_from_ports,lwip)/include/lwip
INC_DIR += $(REP_DIR)/include/lwip

View File

@ -1,3 +1,2 @@
MPC = mpc-0.9
REP_INC_DIR += include/mpc REP_INC_DIR += include/mpc
INC_DIR += $(call select_from_ports,mpc)/include/mpc

View File

@ -1 +1,2 @@
REP_INC_DIR += include/mpfr REP_INC_DIR += include/mpfr
INC_DIR += $(call select_from_ports,mpfr)/include/mpfr

View File

@ -1 +1,2 @@
REP_INC_DIR += include/mupdf INC_DIR += $(call select_from_ports,mupdf)/include/mupdf

View File

@ -1 +1,2 @@
REP_INC_DIR += include/ncurses REP_INC_DIR += include/ncurses
INC_DIR += $(call select_from_ports,ncurses)/include/ncurses

View File

@ -1 +1 @@
REP_INC_DIR += include/openjpeg INC_DIR += $(call select_from_ports,openjpeg)/include/openjpeg

View File

@ -1 +1 @@
REP_INC_DIR += include/pcre INC_DIR += $(call select_from_ports,pcre)/include/pcre

View File

@ -1,5 +1,6 @@
PYTHON = python-2.6.4 PYTHON = python-2.6.4
REP_INC_DIR += include/python REP_INC_DIR += include/python
INC_DIR += $(call select_from_ports,python)/include
ifeq ($(filter-out $(SPECS),x86),) ifeq ($(filter-out $(SPECS),x86),)
ifeq ($(filter-out $(SPECS),32bit),) ifeq ($(filter-out $(SPECS),32bit),)

View File

@ -0,0 +1 @@
INC_DIR += $(call select_from_ports,qoost)/include

View File

@ -105,8 +105,9 @@ INC_DIR += $(QT5_REP_DIR)/include/qt5/genode
# included (in 'base/mk/lib.mk') by iterating through the elements of the # included (in 'base/mk/lib.mk') by iterating through the elements of the
# 'LIBS' variable. Hence, we also need to manually import the stdlib snippet. # 'LIBS' variable. Hence, we also need to manually import the stdlib snippet.
# #
LIBS += stdcxx LIBS += stdcxx gallium
include $(call select_from_repositories,lib/import/import-stdcxx.mk) include $(call select_from_repositories,lib/import/import-stdcxx.mk)
include $(call select_from_repositories,lib/import/import-gallium.mk)
# custom main() thread stack size support via main() wrapper # custom main() thread stack size support via main() wrapper
ifeq ($(findstring -DQT_MAIN_STACK_SIZE, $(CC_CXX_OPT)), -DQT_MAIN_STACK_SIZE) ifeq ($(findstring -DQT_MAIN_STACK_SIZE, $(CC_CXX_OPT)), -DQT_MAIN_STACK_SIZE)

View File

@ -0,0 +1 @@
INC_DIR += $(call select_from_ports,readline)/include

View File

@ -1 +1,4 @@
REP_INC_DIR += include/SDL SDL_PORT_DIR := $(call select_from_ports,sdl)
INC_DIR += $(SDL_PORT_DIR)/include $(SDL_PORT_DIR)/include/SDL
REP_INC_DIR += include/SDL

View File

@ -0,0 +1 @@
INC_DIR += $(call select_from_ports,sdl_image)/include

View File

@ -0,0 +1 @@
INC_DIR += $(call select_from_ports,sdl_mixer)/include

View File

@ -0,0 +1,2 @@
SDL_NET_PORT_DIR := $(call select_from_ports,sdl_net)
INC_DIR += $(SDL_NET_PORT_DIR)/include $(SDL_NET_PORT_DIR)/include/SDL

View File

@ -0,0 +1 @@
INC_DIR += $(call select_from_ports,sdl_ttf)/include

View File

@ -1,8 +1,15 @@
REP_INC_DIR += include/stdcxx STDCXX_INCLUDE_DIR := $(call select_from_repositories,include/stdcxx)
REP_INC_DIR += include/stdcxx/std
REP_INC_DIR += include/stdcxx/c_std INC_DIR += $(STDCXX_INCLUDE_DIR) \
REP_INC_DIR += include/stdcxx/c_global $(STDCXX_INCLUDE_DIR)/std \
REP_INC_DIR += include/stdcxx-genode $(STDCXX_INCLUDE_DIR)/c_std \
$(STDCXX_INCLUDE_DIR)/c_global
STDCXX_PORT_INCLUDE_DIR := $(call select_from_ports,stdcxx)/include/stdcxx
INC_DIR += $(STDCXX_PORT_INCLUDE_DIR) \
$(STDCXX_PORT_INCLUDE_DIR)/std \
$(STDCXX_PORT_INCLUDE_DIR)/c_std \
$(STDCXX_PORT_INCLUDE_DIR)/c_global
LIBS += libc LIBS += libc
include $(call select_from_repositories,lib/import/import-libc.mk) include $(call select_from_repositories,lib/import/import-libc.mk)

View File

@ -0,0 +1 @@
INC_DIR += $(call select_from_ports,x86emu)/include

View File

@ -1 +1 @@
REP_INC_DIR += include/zlib INC_DIR += $(call select_from_ports,zlib)/include/zlib

View File

@ -9,8 +9,6 @@ FILTER_OUT += udiv_w_sdiv.c
SRC_ASM += copyd.asm copyi.asm SRC_ASM += copyd.asm copyi.asm
FILTER_OUT += popham.c FILTER_OUT += popham.c
CC_OPT_hamdist = -DOPERATION_hamdist
CC_OPT_popcount = -DOPERATION_popcount
SRC_ASM += add_n.asm SRC_ASM += add_n.asm
FILTER_OUT += add_n.c FILTER_OUT += add_n.c
@ -26,7 +24,7 @@ include $(REP_DIR)/lib/mk/gmp.inc
PWD := $(shell pwd) PWD := $(shell pwd)
SRC_O += $(SRC_ASM:.asm=.o) SRC_O += $(SRC_ASM:.asm=.o) hamdist.o popcount.o
# #
# Create execution environment for the m4-ccas tool, which is used by the gmp # Create execution environment for the m4-ccas tool, which is used by the gmp
@ -52,6 +50,10 @@ ifneq ($(VERBOSE),)
M4_OUTPUT_FILTER = > /dev/null M4_OUTPUT_FILTER = > /dev/null
endif endif
hamdist.o popcount.o: popham.c
$(MSG_COMP)$@
$(VERBOSE)$(CC) $(CC_DEF) $(CC_C_OPT) -DOPERATION_${@:.o=} $(INCLUDES) -c $< -o $@
%.o: %.asm %.o: %.asm
$(MSG_ASSEM)$@ $(MSG_ASSEM)$@
$(VERBOSE)cd m4env/mpn; \ $(VERBOSE)cd m4env/mpn; \
@ -61,5 +63,4 @@ endif
vpath %.c $(REP_DIR)/src/lib/gmp/mpn/arm vpath %.c $(REP_DIR)/src/lib/gmp/mpn/arm
vpath %.c $(REP_DIR)/src/lib/gmp/mpn/32bit vpath %.c $(REP_DIR)/src/lib/gmp/mpn/32bit
vpath %.c $(GMP_MPN_DIR)/generic vpath %.c $(GMP_MPN_DIR)/generic
#vpath %.asm $(REP_DIR)/src/lib/gmp/mpn/
vpath %.asm $(GMP_MPN_DIR)/arm vpath %.asm $(GMP_MPN_DIR)/arm

View File

@ -1,6 +1,6 @@
include $(REP_DIR)/lib/mk/libc-gen.inc include $(REP_DIR)/lib/mk/libc-gen.inc
LIBC_GEN_ARM_DIR = $(LIBC_DIR)/libc/arm/gen LIBC_GEN_ARM_DIR = $(LIBC_DIR)/lib/libc/arm/gen
#FILTER_OUT_S += rfork_thread.S sigsetjmp.S setjmp.S _setjmp.S divsi3.S #FILTER_OUT_S += rfork_thread.S sigsetjmp.S setjmp.S _setjmp.S divsi3.S
FILTER_OUT_S += rfork_thread.S divsi3.S setjmp.S _setjmp.S FILTER_OUT_S += rfork_thread.S divsi3.S setjmp.S _setjmp.S
@ -10,6 +10,6 @@ SRC_S += $(filter-out $(FILTER_OUT_S),$(notdir $(wildcard $(LIBC_GEN_ARM_DIR)/*
SRC_C += $(filter-out $(FILTER_OUT_C),$(notdir $(wildcard $(LIBC_GEN_ARM_DIR)/*.c))) SRC_C += $(filter-out $(FILTER_OUT_C),$(notdir $(wildcard $(LIBC_GEN_ARM_DIR)/*.c)))
# fix missing include prefix for 'ucontext.h', should be 'sys/ucontext.h' # fix missing include prefix for 'ucontext.h', should be 'sys/ucontext.h'
CC_OPT_makecontext = -I$(REP_DIR)/include/libc/sys CC_OPT_makecontext = -I$(call select_from_ports,libc)/include/libc/sys
vpath % $(LIBC_GEN_ARM_DIR) vpath % $(LIBC_GEN_ARM_DIR)

View File

@ -1,4 +1,4 @@
LIBC_GEN_ARM_DIR = $(LIBC_DIR)/libc/arm/gen LIBC_GEN_ARM_DIR = $(LIBC_DIR)/lib/libc/arm/gen
SRC_S = _setjmp.S setjmp.S SRC_S = _setjmp.S setjmp.S

View File

@ -2,10 +2,13 @@ include $(REP_DIR)/lib/mk/av.inc
include $(REP_DIR)/lib/import/import-avcodec.mk include $(REP_DIR)/lib/import/import-avcodec.mk
LIBAVCODEC_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavcodec LIBAV_PORT_DIR := $(call select_from_ports,libav)
LIBAVCODEC_DIR := $(LIBAV_PORT_DIR)/src/lib/libav/libavcodec
include $(LIBAVCODEC_DIR)/Makefile include $(LIBAVCODEC_DIR)/Makefile
LIBS += zlib LIBS += zlib
INC_DIR += $(LIBAV_PORT_DIR)/src/lib/libav
vpath % $(LIBAVCODEC_DIR) vpath % $(LIBAVCODEC_DIR)

View File

@ -2,7 +2,7 @@ include $(REP_DIR)/lib/mk/av.inc
include $(REP_DIR)/lib/import/import-avfilter.mk include $(REP_DIR)/lib/import/import-avfilter.mk
LIBAVFILTER_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavfilter LIBAVFILTER_DIR = $(call select_from_ports,libav)/src/lib/libav/libavfilter
include $(LIBAVFILTER_DIR)/Makefile include $(LIBAVFILTER_DIR)/Makefile

View File

@ -2,7 +2,7 @@ include $(REP_DIR)/lib/mk/av.inc
include $(REP_DIR)/lib/import/import-avformat.mk include $(REP_DIR)/lib/import/import-avformat.mk
LIBAVFORMAT_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavformat LIBAVFORMAT_DIR = $(call select_from_ports,libav)/src/lib/libav/libavformat
include $(LIBAVFORMAT_DIR)/Makefile include $(LIBAVFORMAT_DIR)/Makefile

View File

@ -2,7 +2,7 @@ include $(REP_DIR)/lib/mk/av.inc
include $(REP_DIR)/lib/import/import-avutil.mk include $(REP_DIR)/lib/import/import-avutil.mk
LIBAVUTIL_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavutil LIBAVUTIL_DIR = $(call select_from_ports,libav)/src/lib/libav/libavutil
include $(LIBAVUTIL_DIR)/Makefile include $(LIBAVUTIL_DIR)/Makefile

View File

@ -1,6 +1,4 @@
include $(REP_DIR)/ports/curl.inc CURL_PORT_DIR = $(call select_from_ports,curl)
CURL_DIR = $(REP_DIR)/contrib/$(CURL)
SRC_C = \ SRC_C = \
file.c timeval.c base64.c hostip.c progress.c formdata.c \ file.c timeval.c base64.c hostip.c progress.c formdata.c \
@ -31,4 +29,4 @@ include $(REP_DIR)/lib/import/import-curl.mk
SHARED_LIB = yes SHARED_LIB = yes
vpath %.c $(CURL_DIR)/lib vpath %.c $(CURL_PORT_DIR)/src/lib/curl/lib

View File

@ -1,7 +1,7 @@
include $(REP_DIR)/lib/import/import-expat.mk include $(REP_DIR)/lib/import/import-expat.mk
EXPAT_DIR = $(REP_DIR)/contrib/$(EXPAT) EXPAT_DIR := $(call select_from_ports,expat)/src/lib/expat/contrib
LIBS += libc LIBS += libc
SRC_C = xmlparse.c xmlrole.c xmltok.c SRC_C = xmlparse.c xmlrole.c xmltok.c

View File

@ -2,11 +2,15 @@
# FAT File System Module using a Block session as disk I/O backend # FAT File System Module using a Block session as disk I/O backend
# #
INC_DIR += $(REP_DIR)/src/lib/ffat/contrib FFAT_PORT_DIR := $(call select_from_ports,ffat)
INC_DIR += $(FFAT_PORT_DIR)/include
FFAT_DIR := $(FFAT_PORT_DIR)/src/lib/ffat
SRC_C = ff.c ccsbcs.c SRC_C = ff.c ccsbcs.c
SRC_CC = diskio_block.cc SRC_CC = diskio_block.cc
vpath % $(REP_DIR)/src/lib/ffat/ vpath % $(REP_DIR)/src/lib/ffat/
vpath % $(REP_DIR)/contrib/ff007e/src vpath % $(FFAT_DIR)/src
vpath % $(REP_DIR)/contrib/ff007e/src/option vpath % $(FFAT_DIR)/src/option

View File

@ -1,9 +1,9 @@
FREETYPE = freetype-2.3.9 PORT_DIR := $(call select_from_ports,freetype)
FREETYPE_DIR = $(REP_DIR)/contrib/$(FREETYPE) FREETYPE_DIR := $(PORT_DIR)/src/lib/freetype/contrib
LIBS += libc LIBS += libc
# add local freetype headers to include-search path # add local freetype headers to include-search path
INC_DIR += $(FREETYPE_DIR)/src/base INC_DIR += $(PORT_DIR)/include $(FREETYPE_DIR)/src/base
# use our custom freetype config files # use our custom freetype config files
CC_DEF += -DFT_CONFIG_CONFIG_H="<freetype-genode/ftconfig.h>" CC_DEF += -DFT_CONFIG_CONFIG_H="<freetype-genode/ftconfig.h>"

View File

@ -1,9 +1,11 @@
include $(REP_DIR)/ports/fribidi.inc FRIBIDI_PORT_DIR := $(call select_from_ports,fribidi)
FRIBIDI_DIR = $(REP_DIR)/contrib/$(FRIBIDI) FRIBIDI_DIR := $(FRIBIDI_PORT_DIR)/src/lib/fribidi/contrib
LIBS += libc LIBS += libc
INC_DIR += $(FRIBIDI_DIR) $(REP_DIR)/src/lib/fribidi $(REP_DIR)/include/fribidi INC_DIR += $(FRIBIDI_PORT_DIR)/include/fribidi \
$(REP_DIR)/src/lib/fribidi \
$(REP_DIR)/include/fribidi
SRC_C = $(notdir $(wildcard $(FRIBIDI_DIR)/lib/*.c)) SRC_C = $(notdir $(wildcard $(FRIBIDI_DIR)/lib/*.c))
CC_OPT += -DHAVE_CONFIG_H CC_OPT += -DHAVE_CONFIG_H

View File

@ -1,9 +1,9 @@
include $(REP_DIR)/lib/mk/gallium.inc include $(REP_DIR)/lib/mk/gallium.inc
EGL_ST_SRC_DIR := $(MESA_DIR)/src/gallium/state_trackers/egl EGL_ST_SRC_DIR := $(MESA_PORT_DIR)/src/lib/mesa/src/gallium/state_trackers/egl
INC_DIR += $(EGL_ST_SRC_DIR) INC_DIR += $(EGL_ST_SRC_DIR)
INC_DIR += $(MESA_DIR)/src/egl/main INC_DIR += $(MESA_PORT_DIR)/src/lib/mesa/src/egl/main
INC_DIR += $(MESA_DIR)/src/gallium INC_DIR += $(MESA_PORT_DIR)/src/lib/mesa/src/gallium
CC_OPT += -DRTLD_NODELETE=0 CC_OPT += -DRTLD_NODELETE=0
# generic driver code # generic driver code
@ -12,7 +12,7 @@ vpath %.c $(EGL_ST_SRC_DIR)/common
# state tracker declarations for OpenGL ES1 and ES2 # state tracker declarations for OpenGL ES1 and ES2
SRC_C += st_es1.c st_es2.c SRC_C += st_es1.c st_es2.c
vpath %.c $(MESA_DIR)/src/gallium/state_trackers/es vpath %.c $(MESA_PORT_DIR)/src/lib/mesa/src/gallium/state_trackers/es
# state tracker declarations for OpenGL # state tracker declarations for OpenGL
SRC_C += st_opengl.c SRC_C += st_opengl.c
@ -25,10 +25,10 @@ vpath select_driver.cc $(REP_DIR)/src/lib/egl
LIBS += blit LIBS += blit
# MESA state tracker code # MESA state tracker code
MESA_ST_SRC_DIR := $(MESA_DIR)/src/mesa/state_tracker MESA_ST_SRC_DIR := $(MESA_PORT_DIR)/src/lib/mesa/src/mesa/state_tracker
INC_DIR += $(MESA_ST_SRC_DIR) INC_DIR += $(MESA_ST_SRC_DIR)
INC_DIR += $(MESA_DIR)/src/mesa/main INC_DIR += $(MESA_PORT_DIR)/src/lib/mesa/src/mesa/main
INC_DIR += $(MESA_DIR)/src/mesa INC_DIR += $(MESA_PORT_DIR)/src/lib/mesa/src/mesa
SRC_C += $(notdir $(wildcard $(MESA_ST_SRC_DIR)/*.c)) SRC_C += $(notdir $(wildcard $(MESA_ST_SRC_DIR)/*.c))
vpath %.c $(MESA_ST_SRC_DIR) vpath %.c $(MESA_ST_SRC_DIR)

View File

@ -19,7 +19,7 @@ SRC_CC += query_device_id.cc
vpath query_device_id.cc $(REP_DIR)/src/lib/gallium/i915 vpath query_device_id.cc $(REP_DIR)/src/lib/gallium/i915
# libdrm includes # libdrm includes
LIBDRM_DIR = $(REP_DIR)/contrib/libdrm-2.4.21 LIBDRM_DIR := $(call select_from_ports,libdrm)/src/lib/libdrm
INC_DIR += $(LIBDRM_DIR)/include/drm $(LIBDRM_DIR)/intel INC_DIR += $(LIBDRM_DIR)/include/drm $(LIBDRM_DIR)/intel
# interface to i915 drm device # interface to i915 drm device

View File

@ -1,13 +1,13 @@
MESA = Mesa-7.8.1 MESA_PORT_DIR := $(call select_from_ports,mesa)
MESA_DIR = $(REP_DIR)/contrib/$(MESA) GALLIUM_SRC_DIR := $(MESA_PORT_DIR)/src/lib/mesa/src/gallium
GALLIUM_SRC_DIR = $(MESA_DIR)/src/gallium
LIBS += cxx libc libm LIBS += cxx libc libm mesa_host_tools
INC_DIR += $(GALLIUM_SRC_DIR)/include \ INC_DIR += $(GALLIUM_SRC_DIR)/include \
$(GALLIUM_SRC_DIR)/auxiliary \ $(GALLIUM_SRC_DIR)/auxiliary \
$(GALLIUM_SRC_DIR)/auxiliary/util \ $(GALLIUM_SRC_DIR)/auxiliary/util \
$(GALLIUM_SRC_DIR)/drivers $(GALLIUM_SRC_DIR)/drivers \
$(MESA_PORT_DIR)/include
CC_OPT += -U__linux__ CC_OPT += -U__linux__
@ -18,11 +18,3 @@ CC_OPT += -U__linux__
# that include 'p_compiler.h', we unconditionally include 'sys/types.h'. # that include 'p_compiler.h', we unconditionally include 'sys/types.h'.
# #
CC_OPT += -D__USE_MISC -include sys/types.h CC_OPT += -D__USE_MISC -include sys/types.h
#
# Detect missing preparation of Mesa library, skip unprepared library
#
ifeq ($(wildcard $(REP_DIR)/include/GL),)
REQUIRES = prepare_mesa
endif

View File

@ -1,13 +1,9 @@
GMP_DIR = $(REP_DIR)/contrib/gmp-4.3.2 GMP_DIR = $(call select_from_ports,gmp)/src/lib/gmp
ifeq ($(wildcard $(GMP_DIR)),)
REQUIRES += prepare_gmp
endif
include $(REP_DIR)/lib/import/import-gmp.mk include $(REP_DIR)/lib/import/import-gmp.mk
LIBS += libc LIBS += libc
CC_OPT += -DHAVE_CONFIG_H -D__GMP_WITHIN_GMP CC_OPT += -DHAVE_CONFIG_H -D__GMP_WITHIN_GMP
INC_DIR += $(REP_DIR)/include/gcc INC_DIR += $(REP_DIR)/include/gcc

View File

@ -1,9 +1,11 @@
READLINE = readline-6.0 READLINE_PORT_DIR := $(call select_from_ports,readline)
READLINE_DIR = $(REP_DIR)/contrib/$(READLINE) READLINE_DIR := $(READLINE_PORT_DIR)/src/lib/readline
LIBS += libc
LIBS += libc
# use our customized 'config.h' # use our customized 'config.h'
INC_DIR += $(REP_DIR)/include/readline INC_DIR += $(REP_DIR)/include/readline
INC_DIR += $(READLINE_PORT_DIR)/include/readline
# add local readline headers to include-search path # add local readline headers to include-search path
INC_DIR += $(READLINE_DIR) INC_DIR += $(READLINE_DIR)

View File

@ -1,6 +1,6 @@
include $(REP_DIR)/lib/import/import-icu.mk include $(REP_DIR)/lib/import/import-icu.mk
ICU_DIR = $(REP_DIR)/contrib/icu ICU_DIR = $(call select_from_ports,icu)/src/lib/icu
# copy-pasted from $(ICU_DIR)/source/common/Makefile.in and renamed OBJECTS to ICU_COMMON_OBJECTS # copy-pasted from $(ICU_DIR)/source/common/Makefile.in and renamed OBJECTS to ICU_COMMON_OBJECTS

View File

@ -1,5 +1,4 @@
JBIG2DEC = jbig2dec-0.11 JBIG2DEC_DIR = $(call select_from_ports,jbig2dec)/src/lib/jbig2dec
JBIG2DEC_DIR = $(REP_DIR)/contrib/$(JBIG2DEC)
LIBS += libc libpng zlib LIBS += libc libpng zlib
INC_DIR += $(JBIG2DEC_DIR) $(REP_DIR)/include/jbig2dec INC_DIR += $(JBIG2DEC_DIR) $(REP_DIR)/include/jbig2dec

View File

@ -1,5 +1,5 @@
JPEG = jpeg-7 JPEG = jpeg-7
JPEG_DIR = $(REP_DIR)/contrib/$(JPEG) JPEG_DIR = $(call select_from_ports,jpeg)/src/lib/jpeg
LIBS += libc LIBS += libc
# use our customized 'jconfig.h' file # use our customized 'jconfig.h' file

View File

@ -4,15 +4,16 @@
# this enables 'ports/lib/mk/seoul_libc_support.mk' to reuse the definitions. # this enables 'ports/lib/mk/seoul_libc_support.mk' to reuse the definitions.
# #
LIBC_DIR = $(call select_from_repositories,contrib/libc-8.2.0) LIBC_PORT_DIR := $(call select_from_ports,libc)
LIBC_REP_DIR = $(realpath $(subst /contrib/libc-8.2.0,,$(LIBC_DIR))) LIBC_DIR := $(LIBC_PORT_DIR)/src/lib/libc
LIBC_REP_DIR := $(realpath $(call select_from_repositories,include/libc-genode)/../..)
# local libc includes # local libc includes
INC_DIR += $(LIBC_DIR)/libc/locale INC_DIR += $(LIBC_DIR)/lib/libc/locale
INC_DIR += $(LIBC_DIR)/libc/include INC_DIR += $(LIBC_DIR)/lib/libc/include
INC_DIR += $(LIBC_DIR)/libc/stdio INC_DIR += $(LIBC_DIR)/lib/libc/stdio
INC_DIR += $(LIBC_DIR)/libc/net INC_DIR += $(LIBC_DIR)/lib/libc/net
INC_DIR += $(LIBC_DIR)/gdtoa INC_DIR += $(LIBC_DIR)/contrib/gdtoa
#CC_OPT += -DGENODE_RELEASE #CC_OPT += -DGENODE_RELEASE

View File

@ -1,4 +1,4 @@
LIBC_COMPAT_DIR = $(LIBC_DIR)/libc/compat-43 LIBC_COMPAT_DIR = $(LIBC_DIR)/lib/libc/compat-43
SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIBC_COMPAT_DIR)/*.c))) SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIBC_COMPAT_DIR)/*.c)))

View File

@ -1,5 +1,5 @@
GDTOA_DIR = $(LIBC_DIR)/gdtoa GDTOA_DIR = $(LIBC_DIR)/contrib/gdtoa
LIBC_GDTOA_DIR = $(LIBC_DIR)/libc/gdtoa LIBC_GDTOA_DIR = $(LIBC_DIR)/lib/libc/gdtoa
FILTER_OUT = arithchk.c strtodnrp.c qnan.c FILTER_OUT = arithchk.c strtodnrp.c qnan.c
FILTER_OUT += machdep_ldisQ.c machdep_ldisx.c FILTER_OUT += machdep_ldisQ.c machdep_ldisx.c

View File

@ -1,4 +1,4 @@
LIBC_GEN_DIR = $(LIBC_DIR)/libc/gen LIBC_GEN_DIR = $(LIBC_DIR)/lib/libc/gen
# this file produces a warning about a missing header file, lets drop it # this file produces a warning about a missing header file, lets drop it
FILTER_OUT_C += getosreldate.c sem.c valloc.c getpwent.c FILTER_OUT_C += getosreldate.c sem.c valloc.c getpwent.c

View File

@ -1,4 +1,4 @@
LIBC_INET_DIR = $(LIBC_DIR)/libc/inet LIBC_INET_DIR = $(LIBC_DIR)/lib/libc/inet
SRC_C = $(filter-out $(FILTER_OUT_C),$(notdir $(wildcard $(LIBC_INET_DIR)/*.c))) SRC_C = $(filter-out $(FILTER_OUT_C),$(notdir $(wildcard $(LIBC_INET_DIR)/*.c)))

View File

@ -1,6 +1,6 @@
LIBC_ISC_DIR = $(LIBC_DIR)/libc/isc LIBC_ISC_DIR = $(LIBC_DIR)/lib/libc/isc
INC_DIR += $(LIBC_DIR)/libc/isc INC_DIR += $(LIBC_DIR)/lib/libc/isc
SRC_C = $(notdir $(wildcard $(LIBC_ISC_DIR)/*.c)) SRC_C = $(notdir $(wildcard $(LIBC_ISC_DIR)/*.c))

View File

@ -1,4 +1,4 @@
LIBC_LOCALE_DIR = $(LIBC_DIR)/libc/locale LIBC_LOCALE_DIR = $(LIBC_DIR)/lib/libc/locale
SRC_C = $(notdir $(wildcard $(LIBC_LOCALE_DIR)/*.c)) SRC_C = $(notdir $(wildcard $(LIBC_LOCALE_DIR)/*.c))

View File

@ -1,4 +1,4 @@
LIBC_NAMESER_DIR = $(LIBC_DIR)/libc/nameser LIBC_NAMESER_DIR = $(LIBC_DIR)/lib/libc/nameser
SRC_C = $(notdir $(wildcard $(LIBC_NAMESER_DIR)/*.c)) SRC_C = $(notdir $(wildcard $(LIBC_NAMESER_DIR)/*.c))

View File

@ -1,4 +1,4 @@
LIBC_NET_DIR = $(LIBC_DIR)/libc/net LIBC_NET_DIR = $(LIBC_DIR)/lib/libc/net
# needed for compiling getservbyname() and getservbyport() # needed for compiling getservbyname() and getservbyport()
SRC_C = getservent.c nsdispatch.c nsparser.c nslexer.c SRC_C = getservent.c nsdispatch.c nsparser.c nslexer.c
@ -27,8 +27,9 @@ include $(REP_DIR)/lib/mk/libc-common.inc
INC_DIR += $(REP_DIR)/include/libc INC_DIR += $(REP_DIR)/include/libc
INC_DIR += $(REP_DIR)/include/libc/sys INC_DIR += $(REP_DIR)/include/libc/sys
INC_DIR += $(LIBC_PORT_DIR)/include/libc/sys
# needed for name6.c, contains res_private.h # needed for name6.c, contains res_private.h
INC_DIR += $(LIBC_DIR)/libc/resolv INC_DIR += $(LIBC_DIR)/lib/libc/resolv
vpath %.c $(LIBC_NET_DIR) vpath %.c $(LIBC_NET_DIR)

View File

@ -1,4 +1,4 @@
LIBC_REGEX_DIR = $(LIBC_DIR)/libc/regex LIBC_REGEX_DIR = $(LIBC_DIR)/lib/libc/regex
# #
# 'engine.c' is meant to be included by other compilation units. It cannot # 'engine.c' is meant to be included by other compilation units. It cannot

View File

@ -1,4 +1,4 @@
LIBC_RESOLV_DIR = $(LIBC_DIR)/libc/resolv LIBC_RESOLV_DIR = $(LIBC_DIR)/lib/libc/resolv
SRC_C = $(notdir $(wildcard $(LIBC_RESOLV_DIR)/*.c)) SRC_C = $(notdir $(wildcard $(LIBC_RESOLV_DIR)/*.c))

View File

@ -1,4 +1,4 @@
LIBC_RPC_DIR = $(LIBC_DIR)/libc/rpc LIBC_RPC_DIR = $(LIBC_DIR)/lib/libc/rpc
#SRC_C = $(notdir $(wildcard $(LIBC_RPC_DIR)/*.c)) #SRC_C = $(notdir $(wildcard $(LIBC_RPC_DIR)/*.c))
@ -7,5 +7,6 @@ SRC_C = bindresvport.c
include $(REP_DIR)/lib/mk/libc-common.inc include $(REP_DIR)/lib/mk/libc-common.inc
INC_DIR += $(REP_DIR)/include/libc/sys INC_DIR += $(REP_DIR)/include/libc/sys
INC_DIR += $(LIBC_PORT_DIR)/include/libc/sys
vpath %.c $(LIBC_RPC_DIR) vpath %.c $(LIBC_RPC_DIR)

View File

@ -1,4 +1,4 @@
LIBC_STDIO_DIR = $(LIBC_DIR)/libc/stdio LIBC_STDIO_DIR = $(LIBC_DIR)/lib/libc/stdio
SRC_C = $(notdir $(wildcard $(LIBC_STDIO_DIR)/*.c)) SRC_C = $(notdir $(wildcard $(LIBC_STDIO_DIR)/*.c))

View File

@ -1,4 +1,4 @@
LIBC_STDLIB_DIR = $(LIBC_DIR)/libc/stdlib LIBC_STDLIB_DIR = $(LIBC_DIR)/lib/libc/stdlib
FILTER_OUT = exit.c atexit.c malloc.c FILTER_OUT = exit.c atexit.c malloc.c
#SRC_C = $(notdir $(wildcard $(LIBC_STDLIB_DIR)/*.c)) #SRC_C = $(notdir $(wildcard $(LIBC_STDLIB_DIR)/*.c))

View File

@ -1,4 +1,4 @@
LIBC_STDTIME_DIR = $(LIBC_DIR)/libc/stdtime LIBC_STDTIME_DIR = $(LIBC_DIR)/lib/libc/stdtime
SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIBC_STDTIME_DIR)/*.c))) SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIBC_STDTIME_DIR)/*.c)))

View File

@ -9,7 +9,7 @@
# #
FILTER_OUT = strcoll.c strxfrm.c wcscoll.c wcsxfrm.c FILTER_OUT = strcoll.c strxfrm.c wcscoll.c wcsxfrm.c
LIBC_STRING_DIR = $(LIBC_DIR)/libc/string LIBC_STRING_DIR = $(LIBC_DIR)/lib/libc/string
SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIBC_STRING_DIR)/*.c))) SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIBC_STRING_DIR)/*.c)))

View File

@ -27,7 +27,7 @@ SRC_C += strcoll.c strxfrm.c wcscoll.c wcsxfrm.c
include $(REP_DIR)/lib/mk/libc-common.inc include $(REP_DIR)/lib/mk/libc-common.inc
vpath % $(REP_DIR)/src/lib/libc vpath % $(REP_DIR)/src/lib/libc
vpath % $(LIBC_DIR)/libc/string vpath % $(LIBC_DIR)/lib/libc/string
# #
# Shared library, for libc we need symbol versioning # Shared library, for libc we need symbol versioning

View File

@ -1,11 +1,5 @@
FFAT_DIR = $(REP_DIR)/contrib/ff007e SRC_CC = plugin.cc
LIBS += libc ffat_block
ifeq ($(wildcard $(FFAT_DIR)),)
REQUIRES += prepare_ffat
endif
SRC_CC = plugin.cc
LIBS += libc ffat_block
vpath plugin.cc $(REP_DIR)/src/lib/libc_ffat vpath plugin.cc $(REP_DIR)/src/lib/libc_ffat

View File

@ -1,5 +1,4 @@
include $(REP_DIR)/ports/exfat.inc EXFAT_DIR := $(call select_from_ports,exfat)/src/lib/exfat
EXFAT_DIR = $(REP_DIR)/contrib/$(EXFAT)
SRC_C = $(notdir $(EXFAT_DIR)/fuse/main.c) SRC_C = $(notdir $(EXFAT_DIR)/fuse/main.c)
SRC_CC = init.cc SRC_CC = init.cc

View File

@ -1,5 +1,5 @@
include $(REP_DIR)/ports/fuse-ext2.inc FUSE_EXT2_PORT_DIR := $(call select_from_ports,fuse-ext2)
FUSE_EXT2_DIR = $(REP_DIR)/contrib/$(FUSE_EXT2)/fuse-ext2 FUSE_EXT2_DIR := $(FUSE_EXT2_PORT_DIR)/src/lib/fuse-ext2/fuse-ext2
FILTER_OUT = fuse-ext2.probe.c fuse-ext2.wait.c FILTER_OUT = fuse-ext2.probe.c fuse-ext2.wait.c
SRC_C = $(filter-out $(FILTER_OUT), $(notdir $(wildcard $(FUSE_EXT2_DIR)/*.c))) SRC_C = $(filter-out $(FILTER_OUT), $(notdir $(wildcard $(FUSE_EXT2_DIR)/*.c)))
@ -12,7 +12,8 @@ CC_OPT = -DHAVE_CONFIG_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
CC_CXX_OPT +=-fpermissive CC_CXX_OPT +=-fpermissive
INC_DIR += $(REP_DIR)/src/lib/fuse-ext2 \ INC_DIR += $(REP_DIR)/src/lib/fuse-ext2 \
$(FUSE_EXT2_DIR) $(FUSE_EXT2_DIR) \
$(FUSE_EXT2_PORT_DIR)/include/fuse-ext2
vpath %.c $(FUSE_EXT2_DIR) vpath %.c $(FUSE_EXT2_DIR)
vpath %.cc $(REP_DIR)/src/lib/fuse-ext2 vpath %.cc $(REP_DIR)/src/lib/fuse-ext2

View File

@ -1,5 +1,4 @@
include $(REP_DIR)/ports/ntfs-3g.inc NTFS_3G_DIR := $(call select_from_ports,ntfs-3g)/src/lib/ntfs-3g
NTFS_3G_DIR = $(REP_DIR)/contrib/$(NTFS_3G)
SRC_C = ntfs-3g.c ntfs-3g_common.c SRC_C = ntfs-3g.c ntfs-3g_common.c
SRC_CC = init.cc SRC_CC = init.cc
@ -9,9 +8,9 @@ LIBS = libc libc_fuse libfuse libntfs-3g
CC_OPT = -DHAVE_TIMESPEC -DHAVE_CONFIG_H -DRECORD_LOCKING_NOT_IMPLEMENTED CC_OPT = -DHAVE_TIMESPEC -DHAVE_CONFIG_H -DRECORD_LOCKING_NOT_IMPLEMENTED
INC_DIR += $(REP_DIR)/src/lib/ntfs-3g \ INC_DIR += $(REP_DIR)/src/lib/ntfs-3g \
$(REP_DIR)/contrib/$(NTFS_3G)/src $(NTFS_3G_DIR)/src
vpath %.c $(NTFS_3G_DIR)/src vpath %.c $(NTFS_3G_DIR)/src
vpath %.cc $(REP_DIR)/src/lib/ntfs-3g vpath %.cc $(REP_DIR)/src/lib/ntfs-3g
SHARED_LIB = yes SHARED_LIB = yes

Some files were not shown because too many files have changed in this diff Show More