On 7 March 2018 at 22:18, Wookey wookey@wookware.org wrote:

I've been packaging libopenCSD for debian. That has resulted in various changes, largely to the makefiles. Most of those changes should go upstream, rather than exist only in the debian version.

I'll post my issues/changes here for discussion so we can decide what is upstreamable.

In the meantime anyone interested can try the debian packages here: http://wookware.org/software/repo/ either manually from: http://wookware.org/software/repo/pool/main/libo/libopencsd/

or with deb [ trusted=yes ] http://wookware.org/software/repo unstable main apt update; apt install libopencsd0 (and/or libopencsd-dev libopencsd-doc libopencsd-dbgsym)

I have test this and things install and work seamlessly.

(for debian unstable, amd64 only) (package is signed, but repo isn't. Sorry) Or get the source and rebuild for a different debian-based distro/release.

I've not separated all my changes into proper standalone patches yet, but some are so let's start with those.

1. The doxygen doc build doesn't find all the components because they moved.

This fixes that: Index: libopencsd-0.8.0/decoder/docs/doxygen_config.dox =================================================================== --- libopencsd-0.8.0.orig/decoder/docs/doxygen_config.dox +++ libopencsd-0.8.0/decoder/docs/doxygen_config.dox @@ -765,11 +765,11 @@ WARN_LOGFILE =

INPUT = ../include \ ../include/interfaces \

•                     ../include/etmv3 \
  

•                     ../include/etmv4 \
  

•                     ../include/ptm \
  

•                     ../include/c_api \
  

•                     ../include/stm \
  

•                     ../include/opencsd/etmv3 \
  

•                     ../include/opencsd/etmv4 \
  

•                     ../include/opencsd/ptm \
  

•                     ../include/opencsd/c_api \
  

•                     ../include/opencsd/stm \
                      ../include/mem_acc \
                      ../../README.md \
                      . \
  
  
  

The makefile provides no doc-build. The patch below adds that.

I didn't include an install-docs target, although if you added one with a variable to set the target dir then I'd use it.

Index: libopencsd-0.8.0/decoder/build/linux/makefile

--- libopencsd-0.8.0.orig/decoder/build/linux/makefile +++ libopencsd-0.8.0/decoder/build/linux/makefile @@ -155,6 +155,13 @@ tests: libs cd $(OCSD_ROOT)/tests/build/linux/trc_pkt_lister && make cd $(OCSD_ROOT)/tests/build/linux/c_api_pkt_print_test && make

+# +# build docs +.PHONY: docs +docs:

•   (cd $(OCSD_ROOT/docs); doxygen doxygen_config.dox)
  

############################################################# # clean targets # @@ -176,3 +183,4 @@ clean_install: rm -f $(INSTALL_LIB_DIR)/lib$(LIB_BASE_NAME).so rm -f $(INSTALL_LIB_DIR)/lib$(LIB_CAPI_NAME).so rm -rf $(INSTALL_INCLUDE_DIR)/$(LIB_UAPI_INC_DIR)

•   rm -rf $(OCSD_ROOT)/docs/html
  
  
  

3. The static libraries are built but not installed.

Now static libraries aren't much use to anyone these days, but if you build them then you might as well install them.

This patch does that: Index: libopencsd-0.8.0/decoder/build/linux/makefile =================================================================== --- libopencsd-0.8.0.orig/decoder/build/linux/makefile +++ libopencsd-0.8.0/decoder/build/linux/makefile @@ -136,6 +136,8 @@ mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so $(INSTALL_LIB_DIR)/ $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so $(INSTALL_LIB_DIR)/

•   $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).a $(INSTALL_LIB_DIR)/
  

•   $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).a $(INSTALL_LIB_DIR)/
    cd $(OCSD_ROOT)/build/linux/rctdl_c_api_lib && make install_inc
  
  

################################ @@ -192,6 +194,6 @@ cd $(OCSD_ROOT)/tests/build/linux/c_api_pkt_print_test && make clean

clean_install:

•   rm -f $(INSTALL_LIB_DIR)/lib$(LIB_BASE_NAME).so
  

•   rm -f $(INSTALL_LIB_DIR)/lib$(LIB_CAPI_NAME).so
  

•   rm -f $(INSTALL_LIB_DIR)/lib$(LIB_BASE_NAME).{so,a}
  

•   rm -f $(INSTALL_LIB_DIR)/lib$(LIB_CAPI_NAME).{so,a}
    rm -rf $(INSTALL_INCLUDE_DIR)/$(LIB_UAPI_INC_DIR)
  
  
  

4. The makefile arbitrarily restricts the build to arm and x86

architectures. The only reason for this is in order to build into a particular named directory, and to set -m32/-m64 flags for x86 which should be defaulted correctly on any sensible toolchain or cross-toolchain anyway.

This code can build, and be used, on any arch and the makefile should allow that, so this should be fixed.

I don't see the need to build into a host-arch named PLAT_DIR directory. Is there one? It only does one build at a time, whether crossing or not, so I see no reason not to use a fixed name for this dir, such as 'builddir'. This has no effect on the ability to cross or not. If you really want to change the name of PLAT_DIR then find out the HOST triplet and use that. On debian this is dpkg-architecture -q DEB_HOST_GNU_TYPE, (which is also the same prefix as would be used to specify the toolchain prefix for crossing). But like I say, I think a fixed builddir is actually all you need unless I'm missing something.

So this patch lets the build work on any arch: Index: libopencsd-0.8.0/decoder/build/linux/makefile =================================================================== --- libopencsd-0.8.0.orig/decoder/build/linux/makefile +++ libopencsd-0.8.0/decoder/build/linux/makefile @@ -92,27 +92,6 @@ BUILD_VARIANT=rel endif

-# platform bit size variant -ifeq ($(ARCH),x86)

• MFLAG:="-m32"
• BIT_VARIANT=32

-else ifeq ($(ARCH),x86_64)

• MFLAG:="-m64"
• BIT_VARIANT=64

-else ifeq ($(ARCH),arm)

• BIT_VARIANT=-arm

-else ifeq ($(ARCH),arm64)

• BIT_VARIANT=-arm64

-else ifeq ($(ARCH),aarch64)

• BIT_VARIANT=-arm64

-else ifeq ($(ARCH),aarch32)

• BIT_VARIANT=-arm

-endif

-MASTER_CC_FLAGS += $(MFLAG) -MASTER_CPP_FLAGS += $(MFLAG) -MASTER_LINKER_FLAGS += $(MFLAG)

# export build flags export MASTER_CC_FLAGS export MASTER_CPP_FLAGS @@ -120,7 +99,7 @@ export MASTER_LINKER_FLAGS export MASTER_LIB_FLAGS

# target directories -export PLAT_DIR=linux$(BIT_VARIANT)/$(BUILD_VARIANT) +export PLAT_DIR=builddir export LIB_TARGET_DIR=$(OCSD_LIB_ROOT)/$(PLAT_DIR) export LIB_TEST_TARGET_DIR=$(OCSD_TESTS)/lib/$(PLAT_DIR) export BIN_TEST_TARGET_DIR=$(OCSD_TESTS)/bin/$(PLAT_DIR)

I'm in agreement with the proposed changes - Mike please review on your side.

Thanks, Mathieu

All these patches included as files too.

Wookey

Principal hats: Linaro, Debian, Wookware, ARM http://wookware.org/

---

CoreSight mailing list CoreSight@lists.linaro.org https://lists.linaro.org/mailman/listinfo/coresight