Diff haproxy-2.4.18 with a haproxy-2.4.23

/usr/portage/net-proxy/haproxy/haproxy-2.4.23.ebuild 2023-10-09 14:52:34.752368483 +0300
102 102
	fi
103 103

  
104 104
	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
105
	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
106
	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
105
	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
106
		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
107
	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
108
		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
109
		SBINDIR=/usr/sbin
107 110

  
108 111
	if use tools ; then
109 112
		for extra in ${EXTRAS[@]} ; do
110 113
			if [ "${extra}" = "admin/halog" ]; then
111
				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
114
				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
115
					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
116
					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
112 117
			elif [ "${extra}" = "dev/hpack" ]; then
113
				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
118
				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
119
					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
120
					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
114 121
			else
115 122
				# Those two includes are a workaround for hpack Makefile missing those
116 123
				emake -C ${extra} \
117
					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
124
					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
125
						CC="$(tc-getCC)" ${args[@]}
118 126
			fi
119 127
		done
120 128
	fi
......
122 130

  
123 131
src_install() {
124 132
	dosbin haproxy
125
	dosym ../sbin/haproxy /usr/bin/haproxy
126 133

  
127 134
	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
128 135
	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
......
146 153

  
147 154
	if use tools ; then
148 155
		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
149
		has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
156
		has admin/iprange "${EXTRAS[@]}" && {
157
			newbin admin/iprange/iprange haproxy_iprange
158
			newbin admin/iprange/ip6range haproxy_ip6range
159
		}
150 160
		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
151 161
		has dev/hpack "${EXTRAS[@]}" && {
152 162
			newbin dev/hpack/gen-rht haproxy_gen-rht
Thank you!