Radix cross Linux

Index: Makefile
===================================================================
--- Makefile	(.../openssl/1.1.1r-ppc32/Makefile)	(revision 419)
+++ Makefile	(.../openssl11/1.1.1w-ppc32/Makefile)	(revision 420)
@@ -13,9 +13,9 @@
 include ../../../build-system/constants.mk
 
 
-SOURCE_REQUIRES     = sources/packages/n/openssl
+SOURCE_REQUIRES     = sources/packages/n/openssl11
 
-REQUIRES            = net/openssl/1.1.1r
+REQUIRES            = net/openssl11/1.1.1w
 REQUIRES           += libs/zlib/1.3.1-ppc32
 REQUIRES           += libs/gmp/6.3.0-ppc32
 
@@ -22,8 +22,8 @@
 # ======= __END_OF_REQUIRES__ =======
 
 
-version             = 1.1.1r
-tar_xz_archive      = $(SRC_PACKAGE_PATH)/packages/n/openssl/openssl-$(version).tar.xz
+version             = 1.1.1w
+tar_xz_archive      = $(SRC_PACKAGE_PATH)/packages/n/openssl11/openssl-$(version).tar.xz
 SRC_ARCHIVE         = $(tar_xz_archive)
 SRC_DIR             = $(TARGET_BUILD_DIR)/openssl-$(version)
 src_dir_name        = openssl-$(version)
@@ -31,7 +31,6 @@
 
 PATCHES = PATCHES
 
-build_dir           = $(TARGET_BUILD_DIR)/build
 build_target        = $(TARGET_BUILD_DIR)/.build_done
 install_target      = $(TARGET_BUILD_DIR)/.install_done
 
@@ -42,14 +41,14 @@
 #
 # *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
 #
-OPENSSL32_PKG_NAME                = openssl-x32
-OPENSSL32_PKG_VERSION             = 1.1.1r
+OPENSSL32_PKG_NAME                = openssl11-x32
+OPENSSL32_PKG_VERSION             = 1.1.1w
 OPENSSL32_PKG_ARCH                = $(PKGARCH)
 OPENSSL32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
 OPENSSL32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
 OPENSSL32_PKG_GROUP               = $(PKG_GROUP)
 ###                                |---handy-ruler-------------------------------|
-OPENSSL32_PKG_SHORT_DESCRIPTION   = Secure Sockets Layer toolkit
+OPENSSL32_PKG_SHORT_DESCRIPTION   = Secure Sockets Layer toolkit 1.1.x
 OPENSSL32_PKG_URL                 = $(BUG_URL)
 OPENSSL32_PKG_LICENSE             = GPLv2
 OPENSSL32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(OPENSSL32_PKG_NAME)-pkg-description
@@ -80,7 +79,7 @@
 env_sysroot  = DESTDIR=$(OPENSSL32_PKG)
 
 
-extra_configure_switches  = --libdir=lib$(MULTILIB_PPC32_SUFFIX)
+extra_configure_switches  = --libdir=lib$(MULTILIB_PPC32_SUFFIX)/openssl-1.1
 extra_configure_switches += --openssldir=/etc/ssl
 extra_configure_switches += no-mdc2
 extra_configure_switches += no-ec2m
@@ -99,9 +98,10 @@
 extra_configure_switches += shared
 
 openssl_environment = KERNEL_BITS=32 MACHINE=ppc64 SYSTEM=Linux
-openssl_environment += LDFLAGS=-Wl,-rpath=/lib$(MULTILIB_PPC32_SUFFIX):/usr/lib$(MULTILIB_PPC32_SUFFIX)
 
+LDFLAGS += -Wl,-rpath,/lib$(MULTILIB_PPC32_SUFFIX):/usr/lib$(MULTILIB_PPC32_SUFFIX):/usr/lib$(MULTILIB_PPC32_SUFFIX)/openssl-1.1
 
+
 ####### Dependencies
 
 $(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
@@ -110,9 +110,6 @@
 	@( cd $(SRC_DIR) ; \
 	   find . -name "*.pod" -exec sed -i "s/^\=item \([0-9]\)\(\ \|\.\|$$\)/\=item C<\1>/g" {} \; \
 	 )
-	@( cd $(SRC_DIR) ; \
-	   sed -i "/linux-elf/s/fomit-frame-pointer/fomit-frame-pointer -march=i686 -mtune=i686/g" Configure ; \
-	 )
 	@touch $@
 
 $(build_target): $(src_done)
@@ -128,7 +125,7 @@
 	@mkdir -p $(OPENSSL32_PKG)
 	@cd $(SRC_DIR) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 MANDIR=/usr/share/man install $(env_sysroot)
 ifneq ($(__ENABLE_STATIC__),yes)
-	@rm -f $(OPENSSL32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/*.a
+	@rm -f $(OPENSSL32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/openssl-1.1/*.a
 endif
 	@mkdir -p $(OPENSSL32_PKG)/usr/bin/32
 	@( cd $(OPENSSL32_PKG)/usr/bin ; \
@@ -136,21 +133,25 @@
 	   find . -type f | xargs mv -t 32 ; \
 	 )
 	@mkdir -p $(OPENSSL32_PKG)/lib$(MULTILIB_PPC32_SUFFIX)
-	@( cd $(OPENSSL32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX) ; \
+	@( cd $(OPENSSL32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/openssl-1.1 ; \
 	   chmod +w lib*.so.?.? ; \
-	   mv lib*.so.?.? ../../lib$(MULTILIB_PPC32_SUFFIX) ; \
-	   ln -sf ../../lib$(MULTILIB_PPC32_SUFFIX)/lib*.so.?.? . ; \
+	   mv lib*.so.?.? ../../../lib$(MULTILIB_PPC32_SUFFIX) ; \
+	   ln -sf ../../../lib$(MULTILIB_PPC32_SUFFIX)/lib*.so.?.? . ; \
 	   ln -sf libcrypto.so.?.? libcrypto.so.1 ; \
 	   ln -sf libssl.so.?.? libssl.so.1 ; \
-	   cp -a lib*.so.? ../../lib$(MULTILIB_PPC32_SUFFIX) ; \
+	   cp -a lib*.so.? ../../../lib$(MULTILIB_PPC32_SUFFIX) ; \
 	 )
 	@rm -rf $(OPENSSL32_PKG)/etc
 	@rm -rf $(OPENSSL32_PKG)/usr/include
 	@rm -rf $(OPENSSL32_PKG)/usr/share
+	# ======= Move include files: =======
+	@sed -e 's,/include$$,/include/openssl-1.1,' -i $(OPENSSL32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/openssl-1.1/pkgconfig/*.pc
+	# ======= Rename openssl binary: =======
+	@mv $(OPENSSL32_PKG)/usr/bin/32/openssl $(OPENSSL32_PKG)/usr/bin/32/openssl-1.1
 	# ======= Install the same to $(TARGET_DEST_DIR) =======
 	$(call install-into-devenv, $(OPENSSL32_PKG))
 	# ======= tune pkg-config *.pc search path to the target destination for development =======
-	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_PPC32_SUFFIX)/pkgconfig ; \
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_PPC32_SUFFIX)/openssl-1.1/pkgconfig ; \
 	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libcrypto.pc libssl.pc openssl.pc \
 	 )
 	# ======= Strip binaries =======